Incorrect state handling. Issue # 378