@sunwu: Be consistent