Convert #307586 to Flügger