fix #7
fix #3