Fixed overlap problem