diff --git "a/C:\\Users\\MORNIN~1\\AppData\\Local\\Temp\\colEEAF.module" "b/C:\\Inetpub\\wwwroot\\__git_clones\\collapsiblock\\collapsiblock.module"
index ee008de..3bedc9e 100644
--- "a/C:\\Users\\MORNIN~1\\AppData\\Local\\Temp\\colEEAF.module"
+++ "b/C:\\Inetpub\\wwwroot\\__git_clones\\collapsiblock\\collapsiblock.module"
@@ -150,11 +150,17 @@ function collapsiblock_form_alter(&$form, $form_state, $form_id) {
       '#collapsible' => TRUE,
       '#weight' => -5
     );
+    
+    if (isset($settings['block-' . str_replace('_', '-', $form['module']['#value']) . '-' . str_replace('_', '-', $form['delta']['#value'])])) {
+      $default_value = $settings['block-' . str_replace('_', '-', $form['module']['#value']) . '-' . str_replace('_', '-', $form['delta']['#value'])] ? $settings['block-' . str_replace('_', '-', $form['module']['#value']) . '-' . str_replace('_', '-', $form['delta']['#value'])] : variable_get('collapsiblock_default_state', 1); 
+    } else {
+      $default_value = 1;
+    }
     $form['collapsiblock']['collapse_type'] = array(
-      '#type' => 'radios',
-      '#title' => t('Block collapse behavior'),
-      '#options' => array(1 => t('None.'), 2 => t('Collapsible, expanded by default.'), 3 => t('Collapsible, collapsed by default.'), 4 => t('Collapsible, collapsed all the time.')),
-      '#default_value' => $settings['block-' . $form['module']['#value'] . '-' . $form['delta']['#value']] ? $settings['block-' . $form['module']['#value'] . '-' . $form['delta']['#value']] : variable_get('collapsiblock_default_state', 1),
+    	'#type' => 'radios',
+    	'#title' => t('Block collapse behavior'),
+    	'#options' => array(1 => t('None.'), 2 => t('Collapsible, expanded by default.'), 3 => t('Collapsible, collapsed by default.'), 4 => t('Collapsible, collapsed all the time.')),
+    	'#default_value' => $default_value,
     );
   }
 }
@@ -167,7 +173,7 @@ function collapsiblock_form_alter(&$form, $form_state, $form_id) {
  */
 function collapsiblock_submit($form, &$form_state) {
   $settings = variable_get('collapsiblock_settings', array());
-  $settings['block-' . $form_state['values']['module'] . '-' . $form_state['values']['delta']] = $form_state['values']['collapse_type'];
+  $settings['block-' . str_replace('_', '-', $form_state['values']['module']) . '-' . str_replace('_', '-', $form_state['values']['delta'])] = $form_state['values']['collapse_type'];
   variable_set('collapsiblock_settings', $settings);
 }