Add hack to support deletes