Fix rollback