Convert #624481 to Flügger