diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java
index 75f1bf97..546008b7 100644
--- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java
@@ -171,8 +171,9 @@ public class GemfireFunctionProxyFactoryBean implements FactoryBean<Object>, Met
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (this.functionId != null) {
-		   Assert.isTrue(this.methodMetadata.isSingletonInterface(), "cannot assign default function id if interface has multiple methods");
-		   this.methodMetadata.getSingletonMethodMetada().setFunctionId(this.functionId);
+		   if (this.methodMetadata.isSingletonInterface()) {
+			   this.methodMetadata.getSingletonMethodMetada().setFunctionId(this.functionId);
+		   }
 		}
 	}
 }
diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java
index a48a72b2..6d808573 100644
--- a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java
+++ b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java
@@ -43,24 +43,15 @@ public class FunctionExecutionClientCacheTests {
 	ApplicationContext context;
 	
 	@Test
-	public void testContextCreated() throws Exception {
-		
-		//String name ="testClientOnRegionFunction";
-		String name ="testClientOnServerFunction";
-	    
-	//	GemfireFunctionProxyFactoryBean factoryBean = (GemfireFunctionProxyFactoryBean)context.getBean("&"+name);
-	 
+	public void testContextCreated() throws Exception {    
+	  
 		ClientCache cache = context.getBean("gemfireCache",ClientCache.class);
 		Pool pool = context.getBean("gemfirePool",Pool.class);
 		assertEquals("gemfirePool", pool.getName());
 		assertEquals(1, cache.getDefaultPool().getServers().size());
 		assertEquals(pool.getServers().get(0), cache.getDefaultPool().getServers().get(0));
 		
- 	
 		context.getBean("r1",Region.class);
-		//ComponentScan s;
-		//FilterType f;
-		
 	}
 	
 }