Merge pull request #341 from Catrobat/issue#338

Issue#338
fixes #338