fix #27
fix #32