AncestorOrSelf fixed to work properly on v7