[PATCH v4 3/4] add back original check part2