Fixed overlap bug