[Resolver] Finally solved all regressions.