Convert #624385 to Flügger