Fix after upstream merge #159
Merge pull request #13 from FlorianFieber/upstream-fix

Fix after upstream merge #159