Fix validity error caused by r66068