Fix issue #65

Fix #65