diff --git a/tools/estudio_wizard/lib/wizard/core/wizard_application.e b/tools/estudio_wizard/lib/wizard/core/wizard_application.e
index a58c2ff8..25a34bfb 100644
--- a/tools/estudio_wizard/lib/wizard/core/wizard_application.e
+++ b/tools/estudio_wizard/lib/wizard/core/wizard_application.e
@@ -8,8 +8,6 @@ deferred class
 	WIZARD_APPLICATION
 
 inherit
-	ARGUMENTS
-
 	SHARED_EXECUTION_ENVIRONMENT
 
 feature {NONE} -- Initialization
@@ -18,23 +16,25 @@ feature {NONE} -- Initialization
 			-- Initialize `Current'.
 		local
 			i,n: INTEGER
-			s: READABLE_STRING_8
+			s: READABLE_STRING_32
 			wizard_directory_name: detachable PATH
 			callback_file_name: detachable PATH
+			args: ARGUMENTS_32
 		do
 				-- Usage
-			n := argument_count
+			args := execution_environment.arguments
+			n := args.argument_count
 			if n > 0 then
 				from
 					i := 1
 				until
 					i > n
 				loop
-					s := argument (i)
-					if s.same_string ("-callback") or s.same_string ("--callback") then
+					s := args.argument (i)
+					if s.same_string_general ("-callback") or s.same_string_general ("--callback") then
 						i := i + 1
 						if i <= n then
-							create callback_file_name.make_from_string (argument (i))
+							create callback_file_name.make_from_string (s)
 						end
 					elseif wizard_directory_name = Void then
 						create wizard_directory_name.make_from_string (s)