fix #3 #2