Convert #517533 to Flügger