Fix overlap
Merge pull request #323 from ping19/master

Fix overlap