Convert #409586 to Flügger