Convert #624281 to Flügger