Tried to fix map bug
ALPHA 1.0.2