bugfix & jump state

bugfix & jump state