diff --git a/projects/angular2-jsonapi/src/converters/json-model/json-model.converter.spec.ts b/projects/angular2-jsonapi/src/converters/json-model/json-model.converter.spec.ts
index db0914c0..be91ecbb 100644
--- a/projects/angular2-jsonapi/src/converters/json-model/json-model.converter.spec.ts
+++ b/projects/angular2-jsonapi/src/converters/json-model/json-model.converter.spec.ts
@@ -1,3 +1,5 @@
+import { parseISO } from 'date-fns';
+
 import { JsonModelConverter } from './json-model.converter';
 import { School } from '../../../test/models/school.model';
 
@@ -147,7 +149,7 @@ describe('JsonModel converter', () => {
         result.forEach((element, index: number) => {
           expect(element.name).toBe(DATA[index].name);
           expect(element.students).toBe(DATA[index].students);
-          expect(element.foundation).toContain(DATA[index].foundation);
+          expect(element.foundation).toBe(parseISO(DATA[index].foundation).toISOString());
         });
       });
     });
@@ -167,7 +169,7 @@ describe('JsonModel converter', () => {
         const result = converter.unmask(new School(DATA));
         expect(result.name).toBe(DATA.name);
         expect(result.students).toBe(DATA.students);
-        expect(result.foundation).toContain(DATA.foundation);
+        expect(result.foundation).toBe(parseISO(DATA.foundation).toISOString());
       });
     });
   });
diff --git a/projects/angular2-jsonapi/src/services/json-api-datastore.service.ts b/projects/angular2-jsonapi/src/services/json-api-datastore.service.ts
index e059719b..91ced0ed 100644
--- a/projects/angular2-jsonapi/src/services/json-api-datastore.service.ts
+++ b/projects/angular2-jsonapi/src/services/json-api-datastore.service.ts
@@ -288,7 +288,7 @@ export class JsonApiDatastore {
             };
           }
         }  else if (data[key] === null) {
-          const entity = belongsToMetadata.find((entity: any) => entity.propertyName === key);
+          const entity = belongsToMetadata.find((anEntity: any) => anEntity.propertyName === key);
 
           if (entity) {
             relationships = relationships || {};