Convert #624415 to Flügger