Fix issue #15

Fix Issue #15