Convert #314596 to Flügger