Fix for #333
Merge pull request #343 from XForms/fix-333

close #333