Fixed overlapping map issue