Fixing headpin fencing issues