Fixing references (again)