Fixed another estimate corner-case