fix #166 #167