diff --git a/org.adempiere.base/src/org/compiere/model/MLotCtl.java b/org.adempiere.base/src/org/compiere/model/MLotCtl.java
index 79455b6799..96da820306 100644
--- a/org.adempiere.base/src/org/compiere/model/MLotCtl.java
+++ b/org.adempiere.base/src/org/compiere/model/MLotCtl.java
@@ -17,8 +17,12 @@
 package org.compiere.model;
 
 import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Savepoint;
 import java.util.Properties;
 
+import org.adempiere.exceptions.DBException;
+import org.compiere.util.Trx;
 import org.compiere.util.Util;
 
 /**
@@ -30,9 +34,9 @@ import org.compiere.util.Util;
 public class MLotCtl extends X_M_LotCtl
 {
 	/**
-	 * generated serial id
+	 * 
 	 */
-	private static final long serialVersionUID = -1020114756336617138L;
+	private static final long serialVersionUID = -5538987472159034317L;
 
     /**
      * UUID based Constructor
@@ -87,21 +91,66 @@ public class MLotCtl extends X_M_LotCtl
 	 */
 	public MLot createLot (int M_Product_ID)
 	{
-		StringBuilder name = new StringBuilder();
-		if (getPrefix() != null)
-			name.append(getPrefix());
-		int no = getCurrentNext();
-		name.append(no);
-		if (getSuffix() != null)
-			name.append(getSuffix());
-		//
-		no += getIncrementNo();
-		setCurrentNext(no);
-		saveEx();
-		//
-		MLot retValue = new MLot (this, M_Product_ID, name.toString());
-		retValue.saveEx();
-		return retValue;
+		//use optimistic locking and try 3 time
+		set_OptimisticLockingColumns(new String[]{COLUMNNAME_CurrentNext});
+		set_UseOptimisticLocking(true);
+		for(int i = 0; i < 3; i++)
+		{
+			this.load(get_TrxName());
+			//create savepoint for rollback (if in trx)
+			Trx trx = null;
+			Savepoint savepoint = null;
+			if (get_TrxName() != null)
+				trx = Trx.get(get_TrxName(), false);
+			if (trx != null) {
+				try {
+					savepoint = trx.setSavepoint(null);
+				} catch (SQLException e) {
+					throw new DBException(e);
+				}
+			}
+			try {
+				StringBuilder name = new StringBuilder();
+				if (getPrefix() != null)
+					name.append(getPrefix());
+				int no = getCurrentNext();
+				name.append(no);
+				if (getSuffix() != null)
+					name.append(getSuffix());
+				//
+				no += getIncrementNo();
+				setCurrentNext(no);
+				saveEx();
+				MLot retValue = new MLot (this, M_Product_ID, name.toString());
+				retValue.saveEx();
+				return retValue;
+			} catch (RuntimeException e) {
+				if (savepoint != null) {
+					try {
+						trx.rollback(savepoint);
+					} catch (SQLException e1) {
+						throw new DBException(e1);
+					}
+					savepoint = null;
+				}
+				if (i == 2)
+					throw e;
+				//wait 500ms for other trx
+				try {
+					Thread.sleep(500);
+				} catch (InterruptedException e1) {
+				}
+			} finally {
+				if (savepoint != null) {
+					try {
+						trx.releaseSavepoint(savepoint);
+					} catch (SQLException e) {
+					}
+				}
+			}
+		}
+		//should never reach here
+		return null;
 	}	//	createLot
 
 }	//	MLotCtl
diff --git a/org.idempiere.test/src/org/idempiere/test/model/MAttributeSetTest.java b/org.idempiere.test/src/org/idempiere/test/model/MAttributeSetTest.java
index 2f0567683d..547e585694 100644
--- a/org.idempiere.test/src/org/idempiere/test/model/MAttributeSetTest.java
+++ b/org.idempiere.test/src/org/idempiere/test/model/MAttributeSetTest.java
@@ -177,4 +177,54 @@ public class MAttributeSetTest extends AbstractTestCase {
 			mas.saveEx();
 		}
 	}
+
+	@Test
+	public void testGenerateLot() {
+		MAttributeSet mas = new MAttributeSet(Env.getCtx(), DictionaryIDs.M_AttributeSet.FERTILIZER_LOT.id, null);
+		Trx trx1 = Trx.get(Trx.createTrxName(), true);
+		Trx trx2 = Trx.get(Trx.createTrxName(), true);
+		AtomicReference<String>atomic1 = new AtomicReference<String>(null);
+		AtomicReference<String>atomic2 = new AtomicReference<String>(null);
+		try {
+			TrxRunnable runnable1 = (trxName -> {
+				MAttributeSetInstance asi1 = new MAttributeSetInstance(Env.getCtx(), 0, mas.get_ID(), trxName);
+				String lot1 = asi1.getLot(true, DictionaryIDs.M_Product.FERTILIZER_50.id);
+				try {
+					Thread.sleep(500);
+				} catch (InterruptedException e) {
+				}
+				Trx.get(trxName, false).commit();
+				atomic1.set(lot1);					
+			});
+			TrxRunnable runnable2 = (trxName -> {
+				MAttributeSetInstance asi2 = new MAttributeSetInstance(Env.getCtx(), 0, mas.get_ID(), trx2.getTrxName());
+				String lot2 = asi2.getLot(true, DictionaryIDs.M_Product.FERTILIZER_50.id);
+				Trx.get(trxName, false).commit();
+				atomic2.set(lot2);
+			});
+			Thread t1 = new Thread(() -> {
+				Trx.run(trx1.getTrxName(), runnable1);
+			}) ;
+			Thread t2 = new Thread(() -> {
+				Trx.run(trx2.getTrxName(), runnable2);
+			});
+			t1.start();
+			t2.start();
+			try {
+				t1.join();
+			} catch (InterruptedException e) {
+			}
+			try {
+				t2.join();
+			} catch (InterruptedException e) {
+			}
+			assertNotNull(atomic1.get(), "Lot 1 not generated");
+			assertNotNull(atomic2.get(), "Lot 2 not generated");
+			assertNotEquals(atomic1.get(), atomic2.get(), "Duplicate lot generated");
+		} finally {
+			trx1.close();
+			trx2.close();
+		}			
+	}
+
 }