Add hack to get records into isNew == false state