Convert #541635 to Flügger