Fixed State vs StateService bug