Fixed Map class
commit map