really fix #637