State change bug resolved