Convert #624035 to Flügger