Checks final estimate field validity when switching rows

Fixes #224 
Accidentally included the issue 223 fix in this pull request.