Convert #653771 to Flügger