Fix for ember-data