Convert #541627 to Flügger