Convert #624425 to Flügger