Convert #614357 to Flügger