fix issue #24

Fix issue #24