fix #4, fix #2