diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiInterpolation.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiInterpolation.H
index c4c43de47..730026c6d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiInterpolation.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiInterpolation.H
@@ -27,7 +27,7 @@ Class
 
 Author
     Hrvoje Jasak, Wikki Ltd.  All rights reserved
-    Fethi Tekin, All rights reserved,
+    Fethi Tekin, All rights reserved
 
 Description
     Mass-conservative face interpolation: typedef for stand-alone patch to
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiPolyPatchTemplates.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiPolyPatchTemplates.C
index cb39c323d..16bec4db1 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiPolyPatchTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiPolyPatchTemplates.C
@@ -24,7 +24,7 @@ License
 
 Author
     Hrvoje Jasak, Wikki Ltd.  All rights reserved.
-    Fethi Tekin, All rights reserved.
+    Fethi Tekin, All rights reserved. fethitekin@gmail.com
 
 \*---------------------------------------------------------------------------*/
 
@@ -43,6 +43,7 @@ Foam::overlapGgiPolyPatch::expandSlaveData(const Field<Type>& spf) const
     const label ncp = shadow().nCopies();
 
     tmp<Field<Type> > tef(new Field<Type>(ncp*spf.size()));
+
     Field<Type>& ef = tef();
 
     label nFaces = 0;
@@ -67,11 +68,12 @@ template<class Type>
 Foam::tmp<Foam::Field<Type> >
 Foam::overlapGgiPolyPatch::expandMasterData(const Field<Type>& spf) const
 {
-    const scalar masterAngle = angle();
+    const scalar masterAngle = shadow().angle();
 
-    const label ncpm = nCopies();
+    const label ncpm = shadow().nCopies();
 
     tmp<Field<Type> > tef(new Field<Type>(ncpm*spf.size()));
+
     Field<Type>& ef = tef();
 
     label nFaces = 0;
@@ -91,8 +93,6 @@ Foam::overlapGgiPolyPatch::expandMasterData(const Field<Type>& spf) const
 
     return tef;
 }
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -155,5 +155,4 @@ Foam::overlapGgiPolyPatch::interpolate(const tmp<Field<Type> >& tpf) const
     }
 }
 
-
 // ************************************************************************* //