Fixed bugs that manifested for diff current dumps

Change-Id: Id4b020505d73e63c7f65f8c278b492b13551428b