diff --git a/devel_generate/devel_generate.inc b/devel_generate/devel_generate.inc
index 89d5ff6..2a0e7c2 100644
--- a/devel_generate/devel_generate.inc
+++ b/devel_generate/devel_generate.inc
@@ -145,24 +145,22 @@ function devel_generate_content($form_state) {
 function devel_generate_add_comments($node, $users, $max_comments, $title_length = 8) {
   $num_comments = mt_rand(1, $max_comments);
   for ($i = 1; $i <= $num_comments; $i++) {
-    $comment = new stdClass;
-    $comment->nid = $node->nid;
-    $comment->cid = NULL;
-    $comment->name = 'devel generate';
-    $comment->mail = 'devel_generate@example.com';
-    $comment->timestamp = mt_rand($node->created, REQUEST_TIME);
-
     switch ($i % 3) {
       case 1:
-        $comment->pid = db_query_range("SELECT cid FROM {comment} WHERE pid = 0 AND nid = :nid ORDER BY RAND()", 0, 1, array(':nid' => $comment->nid))->fetchField();
+        $pid = db_query_range("SELECT cid FROM {comment} WHERE pid = 0 AND nid = :nid ORDER BY RAND()", 0, 1, array(':nid' => $node->nid))->fetchField();
         break;
       case 2:
-        $comment->pid = db_query_range("SELECT cid FROM {comment} WHERE pid > 0 AND nid = :nid ORDER BY RAND()", 0, 1, array(':nid' => $comment->nid))->fetchField();
+        $pid = db_query_range("SELECT cid FROM {comment} WHERE pid > 0 AND nid = :nid ORDER BY RAND()", 0, 1, array(':nid' => $node->nid))->fetchField();
         break;
       default:
-        $comment->pid = 0;
+        $pid = 0;
     }
 
+    $comment = entity_create('comment', array('nid' => $node->nid, 'pid' => $pid));
+    $comment->name = 'devel generate';
+    $comment->mail = 'devel_generate@example.com';
+    $comment->timestamp = mt_rand($node->created, REQUEST_TIME);
+
     // The subject column has a max character length of 64
     // See bug: http://drupal.org/node/1024340
     $comment->subject = substr(devel_create_greeking(mt_rand(2, $title_length), TRUE), 0, 63);