Fixed issue #67