fixed initialization of map