Convert #624938 to Flügger