Convert #624318 to Flügger