Convert #624602 to Flügger