Fixed Scalar/SubQuery issue.