fixes type
Merge branch 'hotfix-1.2.1'

* hotfix-1.2.1:
  fixes type