Convert #614331 to Flügger