Fix for new records + links (#1321)

Probably not the right way to do it, but this seems to fix the issue.