Fixed issue #65