fix #1
fix #9