Convert #337482 to Flügger