fix for rollback