Hotfix for error on delete