Fixed reset and jump bug (for real this time)