fix resolution problems
Merge pull request #1 from 2010-DEV-SR-0/fix

fix resolution problems