Convert #541845 to Flügger