fix up self-reference to always include binding