Fix issue #20

Fix issue #20