fixed empty map issue