Convert #539337 to Flügger