[PATCH v9 2/9] add back original check