Convert #307583 to Flügger