Convert #337845 to Flügger