fix #2
fix #1