Convert #337946 to Flügger