Convert #368488 to Flügger