Prevent border from being sent twice
Merge pull request #562 from Fuzzysqurl/patch-6

Prevent border from being sent twice