Fixed DBRef issue