Fixed Map bug