fix #20
fix #18