Convert #658286 to Flügger