fix problem with wrong object, should be tested better next time
Merge branch 'hotfix/V1.1.2_b'