fix #74 and fix #76