fix #44
fix #45