Convert #409455 to Flügger