Fixed casting issue
Merge branch 'hotfix/2'