Fix rollback order