diff --git a/app/helpers/null-time.js b/app/helpers/null-time.js
index 67fbe1c..8d87835 100644
--- a/app/helpers/null-time.js
+++ b/app/helpers/null-time.js
@@ -1,7 +1,9 @@
 import Ember from 'ember';
 import { formatDate } from '../utils/date-helpers';
 
-export default Ember.Handlebars.makeBoundHelper(function(value, format) {
+export default Ember.Helper.helper(function(params) {
+  let value = params[0],
+    format = params[1];
   if (value == null) {
     return 'N/A';
   }
diff --git a/bower.json b/bower.json
index 2edf255..48e0366 100644
--- a/bower.json
+++ b/bower.json
@@ -14,7 +14,7 @@
     "qunit": "~1.18.0",
     "flakes": "~1.0.0",
     "ember-simple-auth": "~0.8.0",
-    "moment": "~2.9.0",
+    "moment": "~2.10.6",
     "select2": "3.5.2",
     "antiscroll": "git://github.com/azirbel/antiscroll.git#90391fb371c7be769bc32e7287c5271981428356",
     "jquery-mousewheel": "~3.1.4",