fix #2 #3