Overlapping issue fixed