Fix for issue #822 and update of test.

Fixes #822 

Testrun: https://jenkins.catrob.at/job/Catroid-Multi-Job-Custom-Branch/856/