Convert #160229 to Flügger