fix #91 fix #92