Convert #337480 to Flügger