Convert #517471 to Flügger