Convert #541829 to Flügger