Convert #658662 to Flügger