fix #91
fix #86