Fixed issue #10