Rollback fix