Convert #339126 to Flügger