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