Convert #339206 to Flügger