App State fix 1