Fixed Map Bug