Convert #517436 to Flügger