nr and resolvers fix