Convert #339577 to Flügger