Convert #337865 to Flügger