diff --git a/form_markup.module b/form_markup.module
index 183d512..6c85d69 100644
--- a/form_markup.module
+++ b/form_markup.module
@@ -22,15 +22,17 @@ function form_markup_form_alter(&$form, $form_state, $form_id) {
  * adds prefix/suffix values to the form (in form_alter)
  */
 function form_markup_add_markup(&$form) {
-  $fields = content_fields(NULL, $form['type']['#value']);
+  module_load_include('inc', 'content', 'includes/content.crud');
+  $fields = content_field_instance_read(array('type_name' => $form['type']['#value']));
   if (is_array($fields)) {
-    foreach ($fields as $field_name => $field) {
+    foreach ($fields as $field) {
+      $field_name = $field['field_name'];
       if (is_array($form[$field_name])) {
         $form[$field_name]['#prefix'] =  $field['widget']['prefix'] . $form[$field_name]['#prefix'];
         $form[$field_name]['#suffix'] .= $field['widget']['suffix'];
       }
-    } 
-  }     
+    }
+  }
 }
 
 /**