Fixed issue #68