Convert #624485 to Flügger