Convert #614392 to Flügger