really fix #652