removed overlap bug