Avoid extra objectSchema lookup
Merge pull request #1008 from hectr/patch-1

Avoid extra objectSchema lookup