fixed startup error #33
Merge branch 'hotfix/error-startup'

* hotfix/error-startup:
  fixed startup error #33