Convert #624431 to Flügger