Seem to have fixed termination issues