fix #16, fix #67