diff --git a/heartbeat.pages.inc b/heartbeat.pages.inc
index e52c0b1..2a5b7e5 100755
--- a/heartbeat.pages.inc
+++ b/heartbeat.pages.inc
@@ -301,18 +301,18 @@ function heartbeat_activity_ahah($element) {
     $ahah_form['#description'] = '<div class="status">' . t('Currently set ') . _heartbeat_activity_get_time($form_state['values'][$element]) . '</div>';
 
     unset($ahah_form['#prefix'], $ahah_form['#suffix']); // Prevent duplicate wrappers.
-    drupal_json(array(
+    drupal_json_output(array(
       'status'   => TRUE,
       'data'     => theme('status_messages') . drupal_render($ahah_form),
       'settings' => call_user_func_array('array_merge_recursive', $javascript['setting']),
     ));
   }
   else {
-    drupal_json(array(
+    drupal_json_output(array(
       'status'   => FALSE,
       'data'     => t('Element not found: @element', array('@element' => $element)),
       'settings' => call_user_func_array('array_merge_recursive', $javascript['setting']),
     ));
   }
   exit;
-}
\ No newline at end of file
+}
diff --git a/modules/heartbeat_comments/heartbeat_comments.module b/modules/heartbeat_comments/heartbeat_comments.module
index 8579396..2d40f2c 100644
--- a/modules/heartbeat_comments/heartbeat_comments.module
+++ b/modules/heartbeat_comments/heartbeat_comments.module
@@ -565,7 +565,7 @@ function heartbeat_comments_form_submit($form = array(), &$form_state = array())
 function heartbeat_comments_load_js() {
 
   if (!isset($_POST['uaid'])) {
-    drupal_json(array('status' => TRUE, 'data' => 'No message id given'));
+    drupal_json_output(array('status' => TRUE, 'data' => 'No message id given'));
   }
   $uaid = $_POST['uaid'];
   $nid = 0;
@@ -588,7 +588,7 @@ function heartbeat_comments_load_js() {
   }
   $output = theme('heartbeat_comments', array('comments' => $reactions, 'activity' => $heartbeatActivity));
 
-  drupal_json(array('status' => TRUE, 'data' => $output, 'uaid' => $uaid));
+  drupal_json_output(array('status' => TRUE, 'data' => $output, 'uaid' => $uaid));
 
 }
 
@@ -1041,4 +1041,4 @@ function _heartbeat_comments_delete($hcid) {
 
 /**
  * eof().
- */
\ No newline at end of file
+ */