Convert #624277 to Flügger