Convert #339527 to Flügger