Convert #339407 to Flügger