Convert #517229 to Flügger