diff --git a/src/finder.h b/src/finder.h
index 0fdb3a3..80e66ff 100644
--- a/src/finder.h
+++ b/src/finder.h
@@ -220,7 +220,6 @@ public:
 	{
 		this->out_stream = &out_stream;
 		this->model_connector = &model_connector;
-		set_out_stream();
 
 		return select();
 	}
@@ -229,7 +228,6 @@ public:
 	{
 		this->out_stream = &out_stream;
 		this->model_connector = model_connector;
-		set_out_stream();
 
 		return select();
 	}
@@ -242,6 +240,11 @@ public:
 			prepare_to_select();
 		}
 
+		model.set_connector(model_connector);
+		model.model_data = model_data;
+		// we don't have to clear the model because it is not returned to the user
+		// the returned model is from Cursor
+
 		if( model_connector && out_stream )
 		{
 			(*out_stream) << "SELECT ";
diff --git a/src/model.h b/src/model.h
index 730af48..bc37bcc 100644
--- a/src/model.h
+++ b/src/model.h
@@ -977,7 +977,7 @@ protected:
 	virtual bool is_empty_field(const wchar_t * value);
 
 
-//	template<typename ModelClass> friend class Finder;
+	template<typename ModelClass> friend class Finder;
 	template<typename ModelClass> friend class Cursor;
 	friend class BaseExpression;