finished hotfix
Merge branch 'hotfix/Problem_1' into develop