Fix issue #12

Fix issue #12