diff --git a/lib/preparedstatement.js b/lib/preparedstatement.js
index 9b5c1be..1e39caa 100644
--- a/lib/preparedstatement.js
+++ b/lib/preparedstatement.js
@@ -28,9 +28,24 @@ PreparedStatement.prototype.clearParameters = function(callback) {
 };
 
 PreparedStatement.prototype.execute = function(callback) {
-  this._ps.execute(function(err, result) {
+  var ps = this._ps
+  ps.execute(function(err, isResultSet) {
     if (err) { winston.error(err); return callback(err); }
-    callback(null, result);
+    if (isResultSet) {
+      ps.getResultSet(function(err, resultset) {
+        if (err) {
+          return callback(err);
+        }
+        return callback(null, new ResultSet(resultset));
+      });
+    } else {
+      ps.getUpdateCount(function(err, count) {
+        if (err) {
+          return callback(err);
+        }
+        return callback(null, count);
+      });
+    }
   });
 };