fix #167 #159