fix #9 fix #10 fix #11