Krishna: Fixing map issue