Convert #541129 to Flügger