#673 - solve numeric instability