fixing usage of Resolver, not needed anymore