Fixed overlapping issue!!!!!