fix #88 fix #86