fix #694
fix #689