Convert #337471 to Flügger