Convert #541946 to Flügger