fix #700
fix quit