should use resolver
change look to lookup
Merge pull request #3139 from imginohu/master

should use resolver