Fixed State issue