Convert #541971 to Flügger