Convert #624231 to Flügger