Convert #517419 to Flügger