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 9921bbce..478b3faf 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
@@ -53,7 +53,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)