Convert #541837 to Flügger