Bug fix: when no analytic derivation and change in x very small.

Manual cherry pick from commit:afc2454913340799206b6fb8c8305d0b9afc645a