Fix for item #1133
Merge pull request #8 from Ongy/Ticket1133

Fix for item #1133
Fixes #133