! more fix backporting
Merge pull request #1780 from Spuds/fii

fix backporting