fix #9, fix #10