- fixed #68, #67