Convert #624237 to Flügger