* Fix a slight bug in the state-machine. This caused the client end of a