diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java b/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java
index f044ea54f9..31955fa886 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java
@@ -7,6 +7,7 @@
 package org.hibernate.mapping;
 
 import java.io.Serializable;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.function.SQLFunctionRegistry;
@@ -20,13 +21,14 @@
  * @author Gavin King
  */
 public class Formula implements Selectable, Serializable {
-	private static int formulaUniqueInteger;
+
+	private static final AtomicInteger formulaUniqueInteger = new AtomicInteger();
 
 	private String formula;
-	private int uniqueInteger;
+	private final int uniqueInteger;
 
 	public Formula() {
-		uniqueInteger = formulaUniqueInteger++;
+		uniqueInteger = formulaUniqueInteger.incrementAndGet();
 	}
 
 	public Formula(String formula) {