! Autofocus messes things up at times... (fixes #2443)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2447 from Oldiesmann/release-2.1

! Autofocus messes things up at times... (fixes #2443)