Convert #658278 to Flügger