fix #24
fix #20