fix #5 #7