Convert #409848 to Flügger