Convert #541734 to Flügger