Convert #624609 to Flügger