Bug #1319: Fix references not coming from a content file incorrectly overwriting each other