Convert #549577 to Flügger