--- a/modules/heartbeat_comments/heartbeat_comments.module	2015-01-26 13:07:23.689443000 +0530
+++ b/modules/heartbeat_comments/heartbeat_comments.module	2015-01-26 13:20:38.041410308 +0530
@@ -383,7 +383,7 @@
   $message = '';
 
   $message = ($ahah ? $_REQUEST['message'] : $form_state['values']['message']);
-  $uaid = ($ahah ? $_REQUEST['uaid'] : (isset($form_state['values']['uaid']) ? $form_state['values']['uaid'] : $form_state['clicked_button']['#post']['uaid']));
+  $uaid = ($ahah ? $_REQUEST['uaid'] : (isset($form_state['input']['uaid']) ? $form_state['input']['uaid'] : $form_state['clicked_button']['#post']['uaid']));
   $nid = ($ahah ? $_REQUEST['nid'] : (isset($form_state['values']['nid']) ? $form_state['values']['nid']: 0));
   $node_comment = $nid > 0 && ($ahah ? $_POST['node_comment'] : $form_state['values']['node_comment']);
   $first_comment = ($ahah ? (isset($_REQUEST['first_comment']) ? $_REQUEST['first_comment'] : 0) : (isset($form_state['values']['first_comment']) ? $form_state['values']['first_comment'] : 0));