Convert #409835 to Flügger