Fixed Issue#327
Added a fix for Issue#321
Merge pull request #334 from Catrobat/Issue#327

Fixed Issue#327