Fixed state overwriting issue
Merge branch 'hotfix/4' into develop