Prevent Overlap fix