Should fix issues with check of records on cloud platforms