diff --git a/src/main/java/in/dragonbra/javasteam/steam/steamclient/callbackmgr/CallbackManager.java b/src/main/java/in/dragonbra/javasteam/steam/steamclient/callbackmgr/CallbackManager.java
index bff2ae7f..297658da 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/steamclient/callbackmgr/CallbackManager.java
+++ b/src/main/java/in/dragonbra/javasteam/steam/steamclient/callbackmgr/CallbackManager.java
@@ -77,7 +77,7 @@ public void runWaitCallbacks() {
      *
      * @param timeout The length of time to block.
      */
-    public void runWaitAllCallbacks(int timeout) {
+    public void runWaitAllCallbacks(long timeout) {
         List<ICallbackMsg> calls = steamClient.getAllCallbacks(true, timeout);
         for (ICallbackMsg call : calls) {
             handle(call);
diff --git a/src/test/java/in/dragonbra/javasteam/steam/steamclient/callbackmgr/CallbackManagerTest.java b/src/test/java/in/dragonbra/javasteam/steam/steamclient/callbackmgr/CallbackManagerTest.java
index cad764fd..e62c0742 100644
--- a/src/test/java/in/dragonbra/javasteam/steam/steamclient/callbackmgr/CallbackManagerTest.java
+++ b/src/test/java/in/dragonbra/javasteam/steam/steamclient/callbackmgr/CallbackManagerTest.java
@@ -189,10 +189,10 @@ public void postedCallbacksTriggerActions() {
                 client.postCallback(callback);
             }
 
-            mgr.runWaitAllCallbacks(1);
+            mgr.runWaitAllCallbacks(1000L);
             assertEquals(10, numCallbacksRun[0]);
 
-            mgr.runWaitAllCallbacks(1);
+            mgr.runWaitAllCallbacks(1000L);
             assertEquals(10, numCallbacksRun[0]);
         } catch (IOException e) {
             e.printStackTrace();