Convert #541787 to Flügger