fix #6
fix #4