diff --git a/builtin.c b/builtin.c
index 7cfc6559f..dee20bff6 100644
--- a/builtin.c
+++ b/builtin.c
@@ -2968,8 +2968,10 @@ static int builtin_case( wchar_t **argv )
 	for( i=1; i<argc; i++ )
 	{
 		free( unescaped );
-		unescaped = unescape( argv[i], 1);
 
+		unescaped = parse_util_unescape_wildcards( argv[i] );
+		
+		
 		if( wildcard_match( current_block->param1.switch_value, unescaped ) )
 		{
 			current_block->skip = 0;
diff --git a/common.c b/common.c
index 228e061f7..32f853c2f 100644
--- a/common.c
+++ b/common.c
@@ -527,8 +527,6 @@ int wcsvarname( wchar_t *str )
 		str++;
 	}
 	return 1;
-	
-	
 }
 
 
diff --git a/complete.c b/complete.c
index f5e3fe333..90e4173e7 100644
--- a/complete.c
+++ b/complete.c
@@ -1001,17 +1001,21 @@ static void copy_strings_with_prefix( array_list_t *comp_out,
 									  array_list_t *possible_comp )
 {
 	int i;
-	wchar_t *wc;
+	wchar_t *wc, *tmp;
 
-	wc = expand_one( 0,
+	tmp = expand_one( 0,
 					 wcsdup(wc_escaped), EXPAND_SKIP_SUBSHELL | EXPAND_SKIP_WILDCARDS);
-	if(!wc)
+	if(!tmp)
 		return;
 
-	if( wc[0] == L'~' )
+	if( tmp[0] == L'~' )
 	{
-		wc=expand_tilde(wc);
+		tmp=expand_tilde(wc);
 	}
+	
+	wc = parse_util_unescape_wildcards( tmp );
+	free(tmp);
+	
 
 //	int str_len = wcslen( str );
 	for( i=0; i<al_get_count( possible_comp ); i++ )
diff --git a/main.c b/main.c
index 268f9815a..25875958a 100644
--- a/main.c
+++ b/main.c
@@ -205,7 +205,7 @@ int main( int argc, char **argv )
 
 	my_optind = optind;
 	
-	is_login |= strcmp( argv[0], "-fish") == 0;
+	is_login |= (strcmp( argv[0], "-fish") == 0);
 		
 	is_interactive_session &= (cmd == 0);
 	is_interactive_session &= (my_optind == argc);
diff --git a/parse_util.c b/parse_util.c
index 13544e483..0f810b4f5 100644
--- a/parse_util.c
+++ b/parse_util.c
@@ -25,6 +25,7 @@
 #include "intern.h"
 #include "exec.h"
 #include "env.h"
+#include "wildcard.h"
 #include "halloc_util.h"
 
 /**
@@ -641,4 +642,41 @@ void parse_util_set_argv( wchar_t **argv )
 	}				
 }
 
+wchar_t *parse_util_unescape_wildcards( const wchar_t *str )
+{
+	wchar_t *in, *out;
+	wchar_t *unescaped = wcsdup(str);
+
+	if( !unescaped )
+		die_mem();
+	
+	for( in=out=unescaped; *in; in++ )
+	{
+		switch( *in )
+		{
+			case L'\\':
+				if( *(in+1) )
+				{
+					in++;
+					*(out++)=*in;
+				}
+				*(out++)=*in;
+				break;
+				
+			case L'*':
+				*(out++)=ANY_STRING;					
+				break;
+				
+			case L'?':
+				*(out++)=ANY_CHAR;					
+				break;
+				
+			default:
+				*(out++)=*in;
+				break;
+		}
+		
+	}
+	return unescaped;
+}
 
diff --git a/parse_util.h b/parse_util.h
index 7562a7417..c29f93d37 100644
--- a/parse_util.h
+++ b/parse_util.h
@@ -87,4 +87,9 @@ void parse_util_load_reset( const wchar_t *path_var );
 */
 void parse_util_set_argv( wchar_t **argv );
 
+/**
+   Make duplicate string, unescape wildcard characters but n ot performing any other character transformation
+*/
+wchar_t *parse_util_unescape_wildcards( const wchar_t *in );
+
 #endif
diff --git a/wildcard.c b/wildcard.c
index fb689b8b1..b51fa61bb 100644
--- a/wildcard.c
+++ b/wildcard.c
@@ -72,7 +72,6 @@ int wildcard_has( const wchar_t *str, int internal )
    \param str String to be matched.
    \param wc The wildcard.
    \param is_first Whether files beginning with dots should not be matched against wildcards. 
-   \param wc_unescaped Whether the unescaped special character ANY_CHAR abd ANY_STRING should be used instead of '?' and '*' for wildcard matching
 */