diff --git a/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/auth/SchemaHelper.java b/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/auth/SchemaHelper.java
index 807f0524..589d8098 100644
--- a/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/auth/SchemaHelper.java
+++ b/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/auth/SchemaHelper.java
@@ -52,7 +52,7 @@ boolean areSchemasAligned(long schemaAlignmentDelayMillis)
     {
         LOG.info("Waiting for schema to align in cluster");
 
-        int delayMillis = 0;
+        long delayMillis = 0;
         while (areLiveNodesWaitingOnSchemaUpdate())
         {
             if (delayMillis >= schemaAlignmentDelayMillis)