Fixed Overlap issue