[PATCH v6 2/6] add back original check