diff --git a/advagg_mod/advagg_mod.module b/advagg_mod/advagg_mod.module
index d581683..bda9eb0 100644
--- a/advagg_mod/advagg_mod.module
+++ b/advagg_mod/advagg_mod.module
@@ -721,7 +721,7 @@ function advagg_mod_advagg_modify_css_pre_render_alter(&$children, &$elements) {
   }
 
   // Return early if this setting is disabled.
-  $css_defer = variable_get('advagg_mod_css_defer', ADVAGG_MOD_CSS_DEFER);
+  list(, , , , , , , , , , $css_defer) = advagg_mod_get_lists(array(), $elements['#items']);
   if (empty($css_defer)) {
     return;
   }
@@ -980,11 +980,13 @@ function advagg_mod_js_no_ajaxpagestate(array &$scripts) {
  *
  * @param array $js
  *   The JS array.
+ * @param array $css
+ *   The CSS array.
  *
  * @return array
  *   A multidimensional array.
  */
-function advagg_mod_get_lists(array $js = array()) {
+function advagg_mod_get_lists(array $js = array(), array $css = array()) {
   $lists = &drupal_static(__FUNCTION__);
   if (!isset($lists)) {
     // Do not move to footer file list.
@@ -1089,6 +1091,8 @@ function advagg_mod_get_lists(array $js = array()) {
     $move_js_to_footer = variable_get('advagg_mod_js_footer', ADVAGG_MOD_JS_FOOTER);
     $defer_setting = variable_get('advagg_mod_js_defer', ADVAGG_MOD_JS_DEFER);
     $async_setting = variable_get('advagg_mod_js_async', ADVAGG_MOD_JS_ASYNC);
+    $css_defer = variable_get('advagg_mod_css_defer', ADVAGG_MOD_CSS_DEFER);
+
 
     // Allow other modules to add/edit the above lists.
     // Call hook_advagg_mod_get_lists_alter().
@@ -1103,8 +1107,9 @@ function advagg_mod_get_lists(array $js = array()) {
       $move_js_to_footer,
       $defer_setting,
       $async_setting,
+      $css_defer,
     );
-    drupal_alter('advagg_mod_get_lists', $lists, $js);
+    drupal_alter('advagg_mod_get_lists', $lists, $js, $css);
   }
   return $lists;
 }
@@ -1117,11 +1122,6 @@ function advagg_mod_get_lists(array $js = array()) {
  */
 function advagg_mod_js_move_to_footer(array &$js) {
   // Move all JS to the footer.
-  $move_js_to_footer = variable_get('advagg_mod_js_footer', ADVAGG_MOD_JS_FOOTER);
-  if (empty($move_js_to_footer)) {
-    return;
-  }
-
   list($header_file_list, $header_inline_list, , , , , $all_in_footer_list, $move_js_to_footer) = advagg_mod_get_lists($js);
   if (empty($move_js_to_footer)) {
     return;
@@ -1201,13 +1201,7 @@ function advagg_mod_js_move_to_footer(array &$js) {
 function advagg_mod_js_async_defer(array &$js) {
   $jquery_defered = FALSE;
 
-  // Return eairly if this is disabled.
-  $defer_setting = variable_get('advagg_mod_js_defer', ADVAGG_MOD_JS_DEFER);
-  $async_setting = variable_get('advagg_mod_js_async', ADVAGG_MOD_JS_ASYNC);
-  if (!$defer_setting && !$async_setting) {
-    return $jquery_defered;
-  }
-
+  // Return early if this is disabled.
   list(, , $no_async_defer_list, $inline_wrapper_list, , , , , $defer_setting, $async_setting) = advagg_mod_get_lists($js);
   if (!$defer_setting && !$async_setting) {
     return $jquery_defered;