making map more robust