Fixed overlap issue #2