diff --git a/base/src/org/compiere/model/MPInstance.java b/base/src/org/compiere/model/MPInstance.java
index 4d89e50e11..176a79c05f 100644
--- a/base/src/org/compiere/model/MPInstance.java
+++ b/base/src/org/compiere/model/MPInstance.java
@@ -21,6 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import java.util.logging.Level;
 
@@ -124,38 +125,12 @@ public class MPInstance extends X_AD_PInstance
 	{
 		if (m_parameters != null)
 			return m_parameters;
-		ArrayList<MPInstancePara> list = new ArrayList<MPInstancePara>();
-		//
-		String sql = "SELECT * FROM AD_PInstance_Para WHERE AD_PInstance_ID=?";
-		PreparedStatement pstmt = null;
-		try
-		{
-			pstmt = DB.prepareStatement(sql, null);
-			pstmt.setInt(1, getAD_PInstance_ID());
-			ResultSet rs = pstmt.executeQuery();
-			while (rs.next())
-			{
-				list.add(new MPInstancePara(getCtx(), rs, null));
-			}
-			rs.close();
-			pstmt.close();
-			pstmt = null;
-		}
-		catch (Exception e)
-		{
-			log.log(Level.SEVERE, sql, e);
-		}
-		finally
-		{
-			try
-			{
-				if (pstmt != null)
-					pstmt.close ();
-			}
-			catch (Exception e)
-			{}
-			pstmt = null;
-		}
+		//FR: [ 2214883 ] Remove SQL code and Replace for Query - red1
+		String whereClause = "AD_PInstance_ID=?";
+		List <MPInstancePara> list = new Query(getCtx(), MPInstancePara.Table_Name, whereClause, null)
+		.setParameters(new Object[]{getAD_PInstance_ID()})
+		.list();
+
 		//
 		m_parameters = new MPInstancePara[list.size()];
 		list.toArray(m_parameters);
diff --git a/extend/src/test/functional/MPInstanceTest.java b/extend/src/test/functional/MPInstanceTest.java
new file mode 100644
index 0000000000..efddcafd05
--- /dev/null
+++ b/extend/src/test/functional/MPInstanceTest.java
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 2008 SC ARHIPAC SERVICE SRL. All Rights Reserved.            *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package test.functional;
+
+import org.compiere.model.MPInstance;
+import org.compiere.model.MPInstancePara;
+import org.compiere.model.MPaySelection;
+import org.compiere.model.MPaySelectionLine;
+import org.compiere.util.Env;
+
+import test.AdempiereTestCase;
+
+/**
+ * @author Teo Sarca, www.arhipac.ro
+ */
+public class MPInstanceTest extends AdempiereTestCase
+{
+	private MPInstance lines = null;
+
+	@Override
+	protected void setUp() throws Exception
+	{
+		super.setUp();
+		assertEquals("Client is not GardenWorld", 11, Env.getAD_Client_ID(getCtx()));
+	}
+	
+	public void testQuery() throws Exception
+	{
+		lines = new MPInstance(getCtx(), 1000000, getTrxName());
+		MPInstancePara[] params = lines.getParameters();
+		assertTrue("There should be params", params.length > 0);
+
+	}
+
+}