fix #2
fix #6