fix #143 #142