fix #91
fix #87