Fix to issue #20