Convert #517636 to Flügger