Fixed self-referencing assocations