Add workaround for double delete problem