fix #1
fix #2