Convert #337982 to Flügger