Fixed state issue
Merge branch 'hotfix/3'