Fix regression where records are validated multiple times
Fix regression where records are validated multiple times

puneet-sutar/broken_record,nickgervasi/broken_record,JunilJacob/broken_record,nikhilmat/broken_record