overlap bug has been fixed