Reverts the if-condition when computing the header overlap
Merge pull request #219 from androidmoney/master

Reverts the if-condition when computing the header overlap