diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index 0145649c2..bda0c5a1b 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -652,7 +652,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         var acceptInvalidValue = NO;
 
         if ([_delegate respondsToSelector:@selector(control:didFailToFormatString:errorDescription:)])
-            acceptInvalidValue = [_delegate control:self didFailToFormatString:[self _inputElement] errorDescription:error];
+            acceptInvalidValue = [_delegate control:self didFailToFormatString:aValue errorDescription:error];
 
         if (acceptInvalidValue === NO)
             return NO;
diff --git a/Tests/Manual/CPFormatterTest/AppController.j b/Tests/Manual/CPFormatterTest/AppController.j
index b1c3728d8..1ee6e06fb 100644
--- a/Tests/Manual/CPFormatterTest/AppController.j
+++ b/Tests/Manual/CPFormatterTest/AppController.j
@@ -80,12 +80,12 @@ var randomFromTo = function(from, to)
 
 - (void)objectValue1:(id)sender
 {
-    CPLog.info("Date 1: %s", [[dateField1 objectValue] description]);
+    console.log("Date 1: %s", [[dateField1 objectValue] description]);
 }
 
 - (void)objectValue2:(id)sender
 {
-    CPLog.info("Date 2: %s", [[dateField2 objectValue] description]);
+    console.log("Date 2: %s", [[dateField2 objectValue] description]);
 }
 
 - (void)setNil:(id)sender
@@ -113,7 +113,7 @@ var randomFromTo = function(from, to)
 
 - (BOOL)control:(CPControl)aControl didFailToFormatString:(CPString)aString errorDescription:(CPString)anError
 {
-    CPLog.info("control:didFailToFormatString:%s errorDescription:%s", aString, anError);
+    console.log("control:didFailToFormatString:%s errorDescription:%s", aString, anError);
 
     if (anError)
     {