Convert #541537 to Flügger