Fixed overzealous termination