Fix: do not update the state-machine when it's not needed