Convert #517846 to Flügger