Fixed a bug in the previous attempt to make the resolver more robust that made it less robust. Now it's more robust.