Fix issue #13
Fix issue #13