diff --git a/src/sbbs3/services.c b/src/sbbs3/services.c
index 7600dacaf32472bd6d7d9188cd504ca443cbef23..140cbd221680ae9e878e5784b7a187f1fc331ab8 100644
--- a/src/sbbs3/services.c
+++ b/src/sbbs3/services.c
@@ -842,6 +842,8 @@ js_initcx(JSRuntime* js_runtime, SOCKET sock, service_client_t* service_client,
 
     JS_SetErrorReporter(js_cx, js_ErrorReporter);
 
+	/* ToDo: call js_CreateCommonObjects() instead */
+
 	do {
 
 		JS_SetContextPrivate(js_cx, service_client);
@@ -877,6 +879,10 @@ js_initcx(JSRuntime* js_runtime, SOCKET sock, service_client_t* service_client,
 		if(js_CreateFileClass(js_cx, js_glob)==NULL)
 			break;
 
+		/* Queue Class */
+		if(js_CreateQueueClass(js_cx, js_glob)==NULL)
+			break;
+
 		/* user-specific objects */
 		if(!js_CreateUserObjects(js_cx, js_glob, &scfg, /*user: */NULL, service_client->client, NULL, NULL)) 
 			break;