Convert #338939 to Flügger