diff --git a/contrib/file_styles/includes/styles/FileStyles.inc b/contrib/file_styles/includes/styles/FileStyles.inc
index 67e63e8..ded006d 100644
--- a/contrib/file_styles/includes/styles/FileStyles.inc
+++ b/contrib/file_styles/includes/styles/FileStyles.inc
@@ -145,14 +145,24 @@ class FileStyles extends StylesDefault {
     // Set any WYSIWYG prescribed styles.
     $styles = array();
     foreach (array('border-width', 'border-style', 'margin', 'margin-top', 'margin-right', 'margin-bottom', 'margin-left') as $attribute) {
-      $value = $this->get($attribute);
+      $value = $this->override($attribute);
+      // using override() fixed disappearing wysiwyg styles
+      // before: $value = $this->get($attribute);
+     
       if (isset($value)) {
         $styles[$attribute] = $attribute .':'. check_plain($value);
       }
     }
 
+    // cocoloco's patch from http://drupal.org/node/1043570
+    // Set float style if set
+    $float = $this->get_float();
+    if (isset($float)) {
+        $styles['float'] = 'float:' . check_plain($float);
+    }
+   
     if (!empty($styles)) {
-      $attributes['style'] = implode(';', $styles);
+      $attributes['style'] = implode(';', $styles) . ';';
     }
 
     if ($image_uri = $this->get_image_uri()) {