Correctly handle short jumps