Fixing fencing issues in headpin

Fixes #1639
Merge pull request #1645 from daviddavis/ff

Fixing headpin fencing issues