Convert #337350 to Flügger