fix #5 #6 #7