Convert #624367 to Flügger