change order of fn name resolution
Merge pull request #12 from jeromew/master

change order of fn name resolution