Convert #307521 to Flügger