Fix State

Change-Id: Ifced47b044cfd994eeaf53991f516ef702dd8eaa