Convert #541881 to Flügger