Convert #598638 to Flügger