really fix #959