Convert #541985 to Flügger