--- C:\Users\Ramesh\AppData\Local\Temp\nat_ng.admin.inc-revBASE.svn000.tmp.inc	2010-07-28 17:12:18.000000000 +-0100
+++ Q:\nbc\inca_trunk\src\sites\all\modules\nat_ng\nat_ng.admin.inc	2010-07-28 17:09:28.000000000 +-0100
@@ -15,13 +15,13 @@
 
   if (empty($vocabularies)) {
     drupal_set_message(t('The NAT-ng module requires at least one vocabulary to be defined.'), 'error');
     drupal_goto('admin/content/taxonomy');
   }
 
-  $nat_ng_config = _nat_ng_variable_get();
+  $nat_ng_config = _nat_ng_variable_get(NULL,TRUE);
 
   foreach ($types as $type => $type_object) {
     $collapsed = (!isset($nat_ng_config['types'][$type])) || (empty($nat_ng_config['types'][$type]));
     $form['nat_ng_'. $type] = array(
       '#type' => 'fieldset',
       '#title' => check_plain($type_object->name),

	   
--- C:\Users\Ramesh\AppData\Local\Temp\nat_ng.module-revBASE.svn000.tmp.module	2010-07-28 17:12:47.000000000 +-0100
+++ Q:\nbc\inca_trunk\src\sites\all\modules\nat_ng\nat_ng.module	2010-07-28 17:09:38.000000000 +-0100
@@ -647,19 +647,22 @@
 
 /**
  * Return a NAT-ng module variable.
  *
  * @param $name
  *   The name of the variable to retrieve.
+ * @param $reset
+ *   Whether to reset the internal variable cache.
+ *   
  * @return
  *   The value of the variable requested.
  */
-function _nat_ng_variable_get($name = NULL) {
+function _nat_ng_variable_get($name = NULL, $reset = FALSE) {
   static $variables = array();
 
-  if (empty($variables)) {
+  if ($reset || empty($variables)) {
     $defaults = array(
       'types' => array(),
       'body' => array(),
       'delete' => array(),
       'delete_node' => array(),
       'related' => array(),
 