Index: nodeblock.module
===================================================================
--- nodeblock.module
+++ nodeblock.module
@@ -640,29 +640,26 @@
 }
 
 /**
- * Implementation of hook_preprocess_node().
+ * Implements hook_preprocess_node().
  *
- * Add node--nodeblock, node--nodeblock--[content-type] and node--nodeblock--[nid]
- * to the suggested theme files for all nodeblock enabled nodes. Note that the
- * order of templates is as follows (last is highest priority):
- * - node.tpl.php
+ * Adds theme hook suggestions for nodeblock enabled nodes after the Drupal's
+ * default suggestions for the following templates and in this order:
  * - node--nodeblock.tpl.php
- * - node--nodeblock--default.tpl.php
- * - node--[content-type].tpl.php
+ * - node--nodeblock--default.tpl.php,
  * - node--nodeblock--[content-type].tpl.php
- * - node--[nid].tpl.php
  * - node--nodeblock--[nid].tpl.php
  */
 function nodeblock_preprocess_node(&$variables) {
   if (isset($variables['node']->nodeblock)) {
-    $variables['theme_hook_suggestions'] = array(
+    // Add nodeblock theme hook suggestions after Drupal's default ones
+    // node__[content-type] and node__[nid] and before other modules' custom
+    // ones, if any.
+    array_splice($variables['theme_hook_suggestions'], 2, 0 , array(
       'node__nodeblock',
       'node__nodeblock__default',
-      'node__' . $variables['node']->type,
       'node__nodeblock__' . $variables['node']->type,
-      'node__' . $variables['node']->nid,
       'node__nodeblock__' . $variables['node']->nid,
-    );
+    ));
   }
 }