Fix Table Checking