diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
index 3aab5b104..4bbcfd840 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
@@ -924,14 +924,14 @@ public class MongoTemplate implements InitializingBean, MongoOperations, Applica
 	 * @return the List of converted objects.
 	 */
 	protected <T> T doFindOne(String collectionName, DBObject query, DBObject fields, Class<T> targetClass, MongoReader<T> reader) {
-		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("findOne using query: " + query.toString());
-		}
 		MongoReader<? super T> readerToUse = reader;
 		if (readerToUse == null) {
 			readerToUse = this.mongoConverter;
 		}
 		substituteMappedIdIfNecessary(query, targetClass, readerToUse);
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("findOne using query: " + query.toString());
+		}
 		return execute(new FindOneCallback(query, fields), new ReadDbObjectCallback<T>(readerToUse, targetClass),
 				collectionName);
 	}
@@ -957,6 +957,9 @@ public class MongoTemplate implements InitializingBean, MongoOperations, Applica
 	 */
 	protected <T> List<T> doFind(String collectionName, DBObject query, DBObject fields, Class<T> targetClass, CursorPreparer preparer) {
 		substituteMappedIdIfNecessary(query, targetClass, mongoConverter);
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("find using query: " + query.toString());
+		}
 		return executeEach(new FindCallback(query, fields), preparer, new ReadDbObjectCallback<T>(mongoConverter, targetClass),
 				collectionName);
 	}
@@ -975,6 +978,9 @@ public class MongoTemplate implements InitializingBean, MongoOperations, Applica
 	 */
 	protected <T> List<T> doFind(String collectionName, DBObject query, DBObject fields, Class<T> targetClass, MongoReader<T> reader) {
 		substituteMappedIdIfNecessary(query, targetClass, reader);
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("find using query: " + query.toString());
+		}
 		return executeEach(new FindCallback(query, fields), null, new ReadDbObjectCallback<T>(reader, targetClass),
 				collectionName);
 	}
@@ -1013,6 +1019,9 @@ public class MongoTemplate implements InitializingBean, MongoOperations, Applica
 			readerToUse = this.mongoConverter;
 		}
 		substituteMappedIdIfNecessary(query, targetClass, readerToUse);
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("findAndRemove using query: " + query.toString());
+		}
 		return execute(new FindAndRemoveCallback(query, fields, sort), new ReadDbObjectCallback<T>(readerToUse, targetClass),
 				collectionName);
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java
index 1462b28b0..b539ebadf 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java
@@ -268,4 +268,35 @@ public class MongoTemplateTests {
     assertThat(found2, notNullValue());
     assertThat(notFound, nullValue());
   }
+
+  @Test
+  public void testUsingAnInQuery() throws Exception {
+
+    PersonWithIdPropertyOfTypeObjectId p1 = new PersonWithIdPropertyOfTypeObjectId();
+    p1.setFirstName("Sven");
+    p1.setAge(11);
+    template.insert(p1);
+    PersonWithIdPropertyOfTypeObjectId p2 = new PersonWithIdPropertyOfTypeObjectId();
+    p2.setFirstName("Mary");
+    p2.setAge(21);
+    template.insert(p2);
+    PersonWithIdPropertyOfTypeObjectId p3 = new PersonWithIdPropertyOfTypeObjectId();
+    p3.setFirstName("Ann");
+    p3.setAge(31);
+    template.insert(p3);
+    PersonWithIdPropertyOfTypeObjectId p4 = new PersonWithIdPropertyOfTypeObjectId();
+    p4.setFirstName("John");
+    p4.setAge(41);
+    template.insert(p4);
+
+    Query q1 = new Query(Criteria.where("age").in(11, 21, 41));
+    List<PersonWithIdPropertyOfTypeObjectId> results1 = template.find(q1, PersonWithIdPropertyOfTypeObjectId.class);
+    Query q2 = new Query(Criteria.where("firstName").in("Ann", "Mary"));
+    List<PersonWithIdPropertyOfTypeObjectId> results2 = template.find(q2, PersonWithIdPropertyOfTypeObjectId.class);
+    Query q3 = new Query(Criteria.where("id").in(p3.getId()));
+    List<PersonWithIdPropertyOfTypeObjectId> results3 = template.find(q3, PersonWithIdPropertyOfTypeObjectId.class);
+    assertThat(results1.size(), is(3));
+    assertThat(results2.size(), is(2));
+    assertThat(results3.size(), is(1));
+  }
 }