Fix for issue #31

Tested with desktop-test