Fix for rollback