Fix normal termination