Fixed State Change Bug