Convert #307647 to Flügger