fixed issues with rollback (VBAT-65)