diff --git a/ChangeLog b/ChangeLog
index b5e554614..b9950cdbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 27 20:37:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSScanner.m: Fix error introduced into skipToNextField() macro
+	my my last rewrite - sorry.  Thanks to N. Pero for narrowing down the
+	problem to a level where I could locate it.
+
 1999-09-24  Adam Fedor  <fedor@gnu.org>
 
 	* configure.in: Add check for Objective-C headers.
diff --git a/Source/NSScanner.m b/Source/NSScanner.m
index d4a5697fa..d20bc9756 100644
--- a/Source/NSScanner.m
+++ b/Source/NSScanner.m
@@ -63,11 +63,11 @@ typedef struct {
  * Return NO if the end of the string is reached.
  * For internal use only.
  */
-#define	skipToNextField()	({ \
-  while (_scanLocation < myLength() \
-    && (*_skipImp)(_charactersToBeSkipped, memSel, myUnicode(_scanLocation))) \
-    _scanLocation++; \
-  (_scanLocation >= myLength()) ? NO : YES; \
+#define	skipToNextField()	({\
+  while (_scanLocation < myLength()\
+    && (*_skipImp)(_charactersToBeSkipped, memSel, myCharacter(_scanLocation)))\
+    _scanLocation++;\
+  (_scanLocation >= myLength()) ? NO : YES;\
 })
 
 + (void) initialize