diff --git a/sites/all/modules/flexslider/theme/flexslider.theme.inc b/sites/all/modules/flexslider/theme/flexslider.theme.inc
index be814ba..20bba2c 100755
--- a/sites/all/modules/flexslider/theme/flexslider.theme.inc
+++ b/sites/all/modules/flexslider/theme/flexslider.theme.inc
@@ -29,10 +29,11 @@ function theme_flexslider_list(&$vars) {
         $image_options = array(
           'style_name' => $optionset->imagestyle_normal,
           'path'       => $item['uri'],
-          'height'     => $item['height'],
-          'width'      => $item['width'],
+          'height'     => isset($item['height']) ? $item['height'] : '',
+          'width'      => isset($item['width']) ? $item['width'] : '',
           'alt'        => $item['alt'],
           'title'      => $item['title'],
+          'attributes' => array(),
         );
       }
 
@@ -40,8 +41,9 @@ function theme_flexslider_list(&$vars) {
       if (!empty($item['title'])) {
         $caption = $item['title'];
       }
+
       $output .= theme('flexslider_list_item', array(
-        'item' => isset($item['slide']) ? $item['slide'] : theme_image_style($image_options),
+        'item' => isset($item['slide']) ? $item['slide'] : (($optionset->imagestyle_normal) ? theme_image_style($image_options) : theme_image($image_options)),
         'thumb' => isset($item['thumb']) ? $item['thumb'] : image_style_url($optionset->imagestyle_thumbnail, $item['uri']),
         'optionset' => $optionset,
         'caption' => $caption,