Removed the bug which was causing problems when screen_tol was non-zero.