Convert #541828 to Flügger