Change to return object, not only the field in object.