Fix 0820 after upstream merge
Merge pull request #14 from FlorianFieber/upstream-fix

Fix 0820 after upstream merge