fix #93 fix #94