Fixed? inf/nan problem