fix #89
fix #91