NoDb fix for broken refs