Convert #614342 to Flügger