Fix scoping doe self instances