Fixed but with delete on termination flag