Convert #541657 to Flügger