Convert #624376 to Flügger