Fix issue #10