Convert #338490 to Flügger