fixed self references omitted in last upstream commit