Fixed map not chaning sometimes