Convert #409466 to Flügger