Fixed overlapping issue