Convert #337485 to Flügger