Workaround for bug 844184
Merge pull request #108 from yurydelendik/bug844184

Workaround for bug 844184