Fix expanding
Merge branch 'hotfix/1.0.2'

* hotfix/1.0.2:
  Fix expanding