fixed again state bug