Convert #524679 to Flügger