diff --git a/src/Nibbler.cpp b/src/Nibbler.cpp
index 50a28d904..a6f2e57e1 100644
--- a/src/Nibbler.cpp
+++ b/src/Nibbler.cpp
@@ -1048,12 +1048,14 @@ bool Nibbler::getName (std::string& result)
 
   if (i < _length)
   {
-    if (isalpha (_input[i]))
+    if (! isdigit (_input[i]) &&
+        ! ispunct (_input[i]) &&
+        ! isspace (_input[i]))
     {
       ++i;
       while (i < _length &&
-             (isalpha (_input[i]) ||
-              isdigit (_input[i])))
+             ! ispunct (_input[i]) &&
+             ! isspace (_input[i]))
       {
         ++i;
       }
diff --git a/test/bug.1006.t b/test/bug.1006.t
index 6fe8d7124..b55dec459 100755
--- a/test/bug.1006.t
+++ b/test/bug.1006.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 4;
+use Test::More tests => 5;
 
 # Create the rc file.
 if (open my $fh, '>', 'bug.rc')
@@ -51,7 +51,11 @@ unlike ($output, qr/description/ms, 'Attribute not completed in description');
 $output = qx{../src/task test rc:bug.rc rc.report.test.columns:description rc.report.test.labels:__};
 like ($output, qr/__/ms, 'Custom column present in the output');
 
-### Cleanup.
+$output = qx{../src/task rc:bug.rc add entrée interdite};
+$output = qx{../src/task rc:bug.rc list interdite};
+like ($output, qr/entrée interdite/, "'entrée' left intact");
+
+# Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data synch.key bug.rc);
 ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
diff --git a/test/nibbler.t.cpp b/test/nibbler.t.cpp
index 983eec4a1..5c582e968 100644
--- a/test/nibbler.t.cpp
+++ b/test/nibbler.t.cpp
@@ -39,15 +39,15 @@ int main (int argc, char** argv)
 {
 #ifdef NIBBLER_FEATURE_DATE
 #ifdef NIBBLER_FEATURE_REGEX
-  UnitTest t (385);
+  UnitTest t (387);
 #else
-  UnitTest t (361);
+  UnitTest t (363);
 #endif
 #else
 #ifdef NIBBLER_FEATURE_REGEX
-  UnitTest t (335);
+  UnitTest t (337);
 #else
-  UnitTest t (311);
+  UnitTest t (313);
 #endif
 #endif