Convert #624928 to Flügger