Convert #624246 to Flügger