fix map changing