Convert #330609 to Flügger