diff --git a/bin/efa b/bin/efa
index a6787f9ab70ed2981f6a9e93c15425542570773b..a2af555802095deb40e26a5f2a04da0f47776793 100755
--- a/bin/efa
+++ b/bin/efa
@@ -136,6 +136,8 @@ sub display_connection {
 	return;
 }
 
+@ARGV = map { decode( 'UTF-8', $_ ) } @ARGV;
+
 #<<<
 GetOptions(
 	$opt,
@@ -178,11 +180,6 @@ for my $pair ( [ \@from, \$from_type ], [ \@via, \$via_type ],
 	[ \@to, \$to_type ], )
 {
 
-	if ( @{ $pair->[0] } ) {
-		$pair->[0]->[0] = decode( 'UTF-8', $pair->[0]->[0] );
-		$pair->[0]->[1] = decode( 'UTF-8', $pair->[0]->[1] );
-	}
-
 	next if ( not defined $pair->[0]->[1] );
 
 	if (