Convert #517453 to Flügger