Convert #541779 to Flügger