diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
index 855948329..f0ca574e3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
@@ -624,7 +624,7 @@ void processEntry(AbstractTreeIterator h, AbstractTreeIterator m,
 				if (hId.equals(iId)) {
 					dce = i.getDirCacheEntry();
 					if (f == null || f.isModified(dce, true))
-						conflict(name, i.getDirCacheEntry(), h, m);
+						conflict(name, dce, h, m);
 					else
 						remove(name);
 				} else
@@ -700,13 +700,13 @@ else if (m == null)
 					if (m==null && walk.isDirectoryFileConflict()) {
 						if (dce != null
 								&& (f == null || f.isModified(dce, true)))
-							conflict(name, i.getDirCacheEntry(), h, m);
+							conflict(name, dce, h, m);
 						else
 							remove(name);
 					} else
-						keep(i.getDirCacheEntry());
+						keep(dce);
 				} else
-					conflict(name, i.getDirCacheEntry(), h, m);
+					conflict(name, dce, h, m);
 			} else if (m == null) {
 
 				/**
@@ -722,21 +722,21 @@ else if (m == null)
 
 				if (hId.equals(iId)) {
 					if (f == null || f.isModified(dce, true))
-						conflict(name, i.getDirCacheEntry(), h, m);
+						conflict(name, dce, h, m);
 					else
 						remove(name);
 				} else
-					conflict(name, i.getDirCacheEntry(), h, m);
+					conflict(name, dce, h, m);
 			} else {
 				if (!hId.equals(mId) && !hId.equals(iId) && !mId.equals(iId))
-					conflict(name, i.getDirCacheEntry(), h, m);
+					conflict(name, dce, h, m);
 				else if (hId.equals(iId) && !mId.equals(iId)) {
 					if (dce != null && (f == null || f.isModified(dce, true)))
-						conflict(name, i.getDirCacheEntry(), h, m);
+						conflict(name, dce, h, m);
 					else
 						update(name, mId, m.getEntryFileMode());
 				} else {
-					keep(i.getDirCacheEntry());
+					keep(dce);
 				}
 			}
 		}