fix #26
fix #20