Convert #307705 to Flügger