Fix self-reference