Add extra check for value table
Minor change