Convert #517528 to Flügger