Convert #517466 to Flügger