fix #43
fix #47