Better resolver handling :)