Overlap fix