diff --git a/examples/embedded_c/embedded_c.c b/examples/embedded_c/embedded_c.c
index 8c02184c..b77e94a6 100644
--- a/examples/embedded_c/embedded_c.c
+++ b/examples/embedded_c/embedded_c.c
@@ -158,14 +158,9 @@ FileHandler(struct mg_connection *conn, void *cbdata)
 struct mg_form_data_handler {
 	int (*field_found)(const char *key,
 	                   size_t keylen,
-	                   const char *value,
-	                   size_t vallen,
+	                   const char *filename,
+	                   int *disposition,
 	                   void *user_data);
-	int (*file_found)(const char *key,
-	                  size_t keylen,
-	                  const char *filename,
-	                  int *disposition,
-	                  void *user_data);
 	void *user_data;
 };
 
@@ -173,15 +168,16 @@ struct mg_form_data_handler {
 int
 field_found(const char *key,
             size_t keylen,
-            const char *value,
-            size_t vallen,
+            const char *filename,
+            int *disposition,
             void *user_data)
 {
 	struct mg_connection *conn = (struct mg_connection *)user_data;
 
 	mg_write(conn, key, keylen);
 	mg_printf(conn, " = ");
-	mg_write(conn, value, vallen);
+	// mg_write(conn, value, vallen);
+	// TODO: disposition = skip/store/read/abort
 	mg_printf(conn, "\r\n");
 
 	return 0;
diff --git a/src/handle_form.inl b/src/handle_form.inl
index ad381be2..bb688c17 100644
--- a/src/handle_form.inl
+++ b/src/handle_form.inl
@@ -49,15 +49,15 @@ struct mg_form_data_handler {
 
 
 static int
-field_found(const char *key,
-            size_t keylen,
-            const char *value,
-            size_t vallen,
-            struct mg_form_data_handler *fdh)
+url_encoded_field_found(const char *key,
+                        size_t keylen,
+                        const char *filename,
+                        int *disposition,
+                        struct mg_form_data_handler *fdh)
 {
 	/* Call callback */
-	mg_url_decode(data, (size_t)keylen, ) return field_found(
-	    data, (size_t)keylen, val, (size_t)vallen, fdh->user_data);
+	/* TODO: mg_url_decode(key, (size_t)keylen, ) */
+	return fdh->field_found(key, keylen, filename, disposition, fdh->user_data);
 }
 
 
@@ -67,7 +67,7 @@ mg_handle_form_data(struct mg_connection *conn,
 {
 	const char *content_type;
 	const char *boundary;
-    int disposition;
+	int disposition;
 
 	int has_body_data =
 	    (conn->request_info.content_length > 0) || (conn->is_chunked);
@@ -110,7 +110,8 @@ mg_handle_form_data(struct mg_connection *conn,
 			}
 			keylen = val - data;
 
-            field_found(data, (size_t)keylen, &disposition, fdh);
+			url_encoded_field_found(
+			    data, (size_t)keylen, NULL, &disposition, fdh);
 
 			val++;
 			next = strchr(val, '&');
@@ -123,7 +124,7 @@ mg_handle_form_data(struct mg_connection *conn,
 			}
 
 			/* Call callback */
-			//field_found(data, (size_t)keylen, val, (size_t)vallen, fdh);
+			// field_found(data, (size_t)keylen, val, (size_t)vallen, fdh);
 
 			/* Proceed to next entry */
 			data = next;