Lazy Loaded Fields break when initial query runs in default stage

This pull request fixes issue #3182 and adds a test case for it.