hack for initializing map problem
fixed merge conflict in MasterController