fixed complete state handling