Fix to issue #10