Workaround for bug 984928
Merge pull request #27 from jonasfj/bug-984928

Workaround for bug 984928