diff -uNr asterisk-1.2.12.1-orig/apps/app_directory.c asterisk-1.2.12.1/apps/app_directory.c
--- asterisk-1.2.12.1-orig/apps/app_directory.c	2006-08-19 03:03:22.000000000 +0200
+++ asterisk-1.2.12.1/apps/app_directory.c	2006-09-17 14:10:28.000000000 +0200
@@ -426,7 +426,7 @@
 		return -1;
 	}
 	if (digit == '0') {
-		if (!ast_goto_if_exists(chan, chan->context, "o", 1) ||
+		if (!ast_goto_if_exists(chan, dialcontext, "o", 1) ||
 		    (!ast_strlen_zero(chan->macrocontext) &&
 		     !ast_goto_if_exists(chan, chan->macrocontext, "o", 1))) {
 			return 0;
@@ -437,7 +437,7 @@
 		}
 	}	
 	if (digit == '*') {
-		if (!ast_goto_if_exists(chan, chan->context, "a", 1) ||
+		if (!ast_goto_if_exists(chan, dialcontext, "a", 1) ||
 		    (!ast_strlen_zero(chan->macrocontext) &&
 		     !ast_goto_if_exists(chan, chan->macrocontext, "a", 1))) {
 			return 0;