Solve random jumps bug
Merge branch 'bug_random_jumps'