Fix for #291

Fix for #291
Merge pull request #292 from darthdeus/patch-2

Fix for #291