Fix check before doing AutoDetectJump
Fixes to AutoDetectJump implementation