Convert #541937 to Flügger