Include '.' in the path before trying to solve names

I'm also not a fan of this, but I'm unsure what we could do better. Idea?