Fixed issue #66, #67