fix #1 #9