fix #95, fix #79