Convert #653686 to Flügger