Backreference hotfix