diff --git a/uutlGenerics.pas b/uutlGenerics.pas
index a3adf0f..86f05db 100644
--- a/uutlGenerics.pas
+++ b/uutlGenerics.pas
@@ -1466,7 +1466,7 @@ end;
 constructor TutlMapBase.Create(const aHashSet: THashSet);
 begin
   inherited Create;
-  fHashSetRef             := aHashSet;
+  fHashSetRef          := aHashSet;
   fKeyWrapper          := TKeyWrapper.Create(fHashSetRef);
   fKeyValuePairWrapper := TKeyValuePairWrapper.Create(fHashSetRef);
 end;
diff --git a/uutlObservableGenerics.pas b/uutlObservableGenerics.pas
index 6fd18a2..ca03813 100644
--- a/uutlObservableGenerics.pas
+++ b/uutlObservableGenerics.pas
@@ -304,7 +304,7 @@ constructor TutlObservableCustomMap.Create(const aComparer: IComparer; const aOw
 begin
   fOnAddItem    := TEventList.Create;
   fOnRemoveItem := TEventList.Create;
-  fHashSetImpl  := TObservableHashSet.Create(self, aComparer, aOwnsObjects);
+  fHashSetImpl  := TObservableHashSet.Create(self, TKeyValuePairComparer.Create(aComparer), aOwnsObjects);
   fHashSetImpl.OnAddItem    := fOnAddItem;
   fHashSetImpl.OnRemoveItem := fOnRemoveItem;
   inherited Create(fHashSetImpl);