Convert #409423 to Flügger