Fixes #60 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit c20d50eb)