bugfixed typecasting
Merge branch 'hotfix/typecasting' into develop