Fix issue #20