fixed minor bug
Merge branch 'hotfix/type_conversion'