fix #43
fix #30