Convert #339845 to Flügger