solving rollback issue