diff --git a/src/Tools/TemplateImage.php b/src/Tools/TemplateImage.php
index 31bdfcc..6ce9a33 100644
--- a/src/Tools/TemplateImage.php
+++ b/src/Tools/TemplateImage.php
@@ -122,28 +122,26 @@ class Tools_TemplateImage
 
         $text     = strtr($text, $this->context);
         $size     = $value->fontSize;
-        fb('font-style');
-        fb($value->fontStyle);
         $fontfile = $this->getFontFile($value->fontFamily . $this->fontSuffix($value->fontStyle));
 
         $color = intval(substr($value->color, 1), 16);
         if ($value->align[0]) { 
-            $align = Drawing::ALIGN_LEFT;
+            $align = Tools_Drawing::ALIGN_LEFT;
         } elseif ($value->align[2]) { 
-            $align = Drawing::ALIGN_RIGHT;
+            $align = Tools_Drawing::ALIGN_RIGHT;
         } else {
-            $align = Drawing::ALIGN_CENTER;
+            $align = Tools_Drawing::ALIGN_CENTER;
         }
 
         if ($value->valign[0]) { 
             $valign = Drawing::ALIGN_TOP;
       } elseif ($value->valign[1]) { 
-            $valign = Drawing::ALIGN_CENTER;
+            $valign = Tools_Drawing::ALIGN_CENTER;
         } else {
-            $valign = Drawing::ALIGN_BOTTOM;
+            $valign = Tools_Drawing::ALIGN_BOTTOM;
         }
 
-        Drawing::imagettftextbox($this->image, $size, 0, $value->left, $value->top, $color, $fontfile, $text, 
+        Tools_Drawing::imagettftextbox($this->image, $size, 0, $value->left, $value->top, $color, $fontfile, $text, 
             $value->width, $value->height,
             $align, $valign);
     }
@@ -154,7 +152,7 @@ class Tools_TemplateImage
     function encode($text)
     {
         assert(is_string($text));
-        return iconv("WINDOWS-1251", "UTF-8", $text);
+        return $text; //iconv("WINDOWS-1251", "UTF-8", $text);
     }
 
     function setSize($new_width, $new_height)