Convert #624324 to Flügger