Finally fix map loading issue.
more
make-map-better
more
more
more