fix broken self references