Convert #517292 to Flügger