fix #162, #163