diff --git a/classes/Format.class.php b/classes/Format.class.php
index 3de49f8..d47e8fd 100644
--- a/classes/Format.class.php
+++ b/classes/Format.class.php
@@ -35,7 +35,7 @@ class Format
     {
         return self::$currency_symbol;
     }
-    
+
     public static function setCurrencySymbol($symbol)
     {
         self::$currency_symbol = $symbol;
@@ -51,7 +51,11 @@ class Format
     static public function int2money($int = 0, $currency = false, $show_decimals = true)
     {
         $money = number_format($int/100, ($show_decimals) ? self::$frac_digits : 0, self::$decimal_point, ' ');
-        return str_replace(' ', html_entity_decode(' ', ENT_COMPAT, 'UTF-8'), $money) . (($currency) ? ' ' . self::$currency_symbol : '');
+        if ($currency) {
+            return str_replace(' ', html_entity_decode(' ', ENT_COMPAT, 'UTF-8'), $money) . (($currency) ? ' ' . self::$currency_symbol : '');
+        } else {
+            return $money . (($currency) ? ' ' . self::$currency_symbol : '');
+        }
     }
 
     static public function money2int($money)