diff --git a/lib/dao.js b/lib/dao.js
index 131be88c..bc04d80b 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -222,7 +222,10 @@ function stillConnecting(dataSource, obj, args) {
  * @param {Object} data The model instance data
  * @param {Function} callback The callback function (optional).
  */
-DataAccessObject.upsert = DataAccessObject.updateOrCreate = function upsert(data, callback) {
+// [FIXME] rfeng: This is a hack to set up 'upsert' first so that
+// 'upsert' will be used as the name for strong-remoting to keep it backward
+// compatible for angular SDK
+DataAccessObject.updateOrCreate = DataAccessObject.upsert = function upsert(data, callback) {
   if (stillConnecting(this.getDataSource(), this, arguments)) {
     return;
   }
@@ -894,7 +897,10 @@ DataAccessObject.remove = DataAccessObject.deleteAll = DataAccessObject.destroyA
  * @param {Function} cb Callback called with (err)
  */
 
-DataAccessObject.removeById = DataAccessObject.deleteById = DataAccessObject.destroyById = function deleteById(id, cb) {
+// [FIXME] rfeng: This is a hack to set up 'deleteById' first so that
+// 'deleteById' will be used as the name for strong-remoting to keep it backward
+// compatible for angular SDK
+DataAccessObject.removeById = DataAccessObject.destroyById = DataAccessObject.deleteById = function deleteById(id, cb) {
       if (stillConnecting(this.getDataSource(), this, arguments)) return;
       var Model = this;
 
diff --git a/package.json b/package.json
index ace15d4e..6d46bf66 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "loopback-datasource-juggler",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "LoopBack DataSoure Juggler",
   "keywords": [
     "StrongLoop",