Should fix ticket #34 (have not tested it, though)