Convert #624077 to Flügger