HOTFIX - States cleared wehn task selected