fixed self references