Fix issue #16
Fix issue #16