Convert #541981 to Flügger