Bugfixing for cross-referenced objects