Workaround for #83

This is some trivial workaround for an issue
Here is code explaining the problem: http://codepaste.net/u1xrpg
Fixes #83