Finally fixed ALL instances of the jump bug