fix #66 & fix #67