Convert #517385 to Flügger