Convert #541961 to Flügger