fixed typo
fixed map change bug