move variable initial place
Merge branch 'hotfix/initial'

* hotfix/initial:
  move variable initial place