1 files changed, 6 insertions, 2 deletions
diff --git a/lib/abi.js b/lib/abi.js
index 674ad8288..e147a3504 100644
--- a/lib/abi.js
+++ b/lib/abi.js
@@ -110,7 +110,7 @@ var setupInputTypes = function () {
         { type: prefixedType('string'), format: formatString }, 
         { type: prefixedType('real'), format: formatInt },
         { type: prefixedType('ureal'), format: formatInt },
-        { type: namedType('address') },
+        { type: namedType('address'), format: formatInt },
         { type: namedType('bool'), format: formatBool }
     ];
 };
@@ -172,6 +172,10 @@ var setupOutputTypes = function () {
         return web3.toAscii(value);
     };
 
+    var formatAddress = function (value) {
+        return "0x" + value.slice(value.length - 40, value.length);
+    };
+
     return [
         { type: prefixedType('uint'), format: formatInt },
         { type: prefixedType('int'), format: formatInt },
@@ -179,7 +183,7 @@ var setupOutputTypes = function () {
         { type: prefixedType('string'), format: formatString },
         { type: prefixedType('real'), format: formatInt },
         { type: prefixedType('ureal'), format: formatInt },
-        { type: namedType('address') },
+        { type: namedType('address'), format: formatAddress },
         { type: namedType('bool'), format: formatBool }
     ];
 };