Trying to fix notify state error bug
Merge branch 'hotfix/0.1.7'