diff --git a/C/init.c b/C/init.c
index 5cdc1aa05..66ca92ef9 100755
--- a/C/init.c
+++ b/C/init.c
@@ -1243,7 +1243,7 @@ struct worker_shared Yap_Global;
 #endif
 
 #if defined(THREADS)
-struct worker_local	*Yap_WLocal[MAX_AGENTS];
+struct worker_local	*Yap_WLocal[MAX_THREADS];
 #elif defined(YAPOR)
 struct worker_local	*Yap_WLocal;
 #else
diff --git a/H/Yap.h b/H/Yap.h
index aa53b9235..2c3ba0c18 100755
--- a/H/Yap.h
+++ b/H/Yap.h
@@ -428,11 +428,6 @@ typedef pthread_rwlock_t rwlock_t;
 #ifdef __alpha
 #include <locks_alpha_funcs.h>
 #endif
-#if defined(THREADS)
-#define MAX_AGENTS MAX_THREADS
-#elif defined(YAPOR)
-#define MAX_AGENTS MAX_WORKERS
-#endif
 #endif
 
 /************ variables	concerned with Error Handling *************/
diff --git a/H/YapHeap.h b/H/YapHeap.h
index bf4bf2e8d..9963408b8 100755
--- a/H/YapHeap.h
+++ b/H/YapHeap.h
@@ -189,7 +189,7 @@ extern struct worker_shared Yap_Global;
 
 #if defined(YAPOR) || defined(THREADS)
 #if defined(THREADS)
-extern struct worker_local	*Yap_WLocal[MAX_AGENTS];
+extern struct worker_local	*Yap_WLocal[MAX_THREADS];
 #define WL (Yap_WLocal[worker_id])
 #define FOREIGN_WL(wid) (Yap_WLocal[(wid)])
 #else