Fix Bug #10

Ref issue #10