githubcs
diff --git a/‎core/src/main/java/com/orientechnologies/orient/core/index/OIndexAbstract.java
Lines changed: 19 additions & 14 deletions b/‎core/src/main/java/com/orientechnologies/orient/core/index/OIndexAbstract.java
Lines changed: 19 additions & 14 deletions
@@ -15,6 +15,18 @@
  */
 package com.orientechnologies.orient.core.index;
 
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
 import com.orientechnologies.common.concur.lock.OModificationLock;
 import com.orientechnologies.common.concur.resource.OSharedResourceAdaptiveExternal;
 import com.orientechnologies.common.listener.OProgressListener;
@@ -45,18 +57,6 @@
 import com.orientechnologies.orient.core.storage.impl.local.OStorageLocal;
 import com.orientechnologies.orient.core.tx.OTransactionIndexChanges.OPERATION;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
 /**
  * Handles indexing when records change.
  * 
@@ -447,9 +447,11 @@ public long rebuild(final OProgressListener iProgressListener) {
     return documentIndexed;
   }
 
-  public boolean remove(final Object key, final OIdentifiable value) {
+  public boolean remove(Object key, final OIdentifiable value) {
     checkForRebuild();
 
+    key = getCollatingValue(key);
+
     modificationLock.requestModificationLock();
     try {
       return remove(key);
@@ -459,9 +461,11 @@ public boolean remove(final Object key, final OIdentifiable value) {
 
   }
 
-  public boolean remove(final Object key) {
+  public boolean remove(Object key) {
     checkForRebuild();
 
+    key = getCollatingValue(key);
+
     modificationLock.requestModificationLock();
 
     try {
@@ -890,6 +894,7 @@ protected Object getCollatingValue(final Object key) {
   protected abstract void removeFromSnapshot(Object key, OIdentifiable value, Map<Object, Object> snapshot);
 
   protected void removeFromSnapshot(Object key, Map<Object, Object> snapshot) {
+    key = getCollatingValue(key);
     snapshot.put(key, RemovedValue.INSTANCE);
   }