diff --git a/Routable.xcodeproj/xcshareddata/xcschemes/Routable.xcscheme b/Routable.xcodeproj/xcshareddata/xcschemes/Routable.xcscheme
index 9a0977e..65c566b 100644
--- a/Routable.xcodeproj/xcshareddata/xcschemes/Routable.xcscheme
+++ b/Routable.xcodeproj/xcshareddata/xcschemes/Routable.xcscheme
@@ -23,17 +23,17 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "F86EF9E3170C3C7B00EB726A"
-               BuildableName = "RoutableTests.octest"
+               BuildableName = "RoutableTests.xctest"
                BlueprintName = "RoutableTests"
                ReferencedContainer = "container:Routable.xcodeproj">
             </BuildableReference>
@@ -48,17 +48,21 @@
             ReferencedContainer = "container:Routable.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "F86EF9C3170C3C7B00EB726A"
@@ -71,12 +75,13 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "F86EF9C3170C3C7B00EB726A"
diff --git a/Routable/Routable.m b/Routable/Routable.m
index b8ae96e..807ac7e 100644
--- a/Routable/Routable.m
+++ b/Routable/Routable.m
@@ -403,15 +403,35 @@ - (UIViewController *)controllerForRouterParams:(RouterParams *)params {
   SEL CONTROLLER_SELECTOR = sel_registerName("initWithRouterParams:");
   UIViewController *controller = nil;
   Class controllerClass = params.routerOptions.openClass;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-  if ([controllerClass respondsToSelector:CONTROLLER_CLASS_SELECTOR]) {
-    controller = [controllerClass performSelector:CONTROLLER_CLASS_SELECTOR withObject:[params controllerParams]];
+
+/***
+ Fix by SerilesJam
+ this place use performselector will be cause leak and will be UIViewController instance can't excute -(void)dealloc 
+ method. We replace the new method 
+ ***/
+    
+ if ([controllerClass respondsToSelector:CONTROLLER_CLASS_SELECTOR]) {
+    NSMethodSignature *sig  = [controllerClass methodSignatureForSelector:CONTROLLER_CLASS_SELECTOR];
+    NSInvocation *invocatin = [NSInvocation invocationWithMethodSignature:sig];
+    [invocatin setTarget:controllerClass];
+    [invocatin setSelector:CONTROLLER_CLASS_SELECTOR];
+    NSDictionary *paramsDic = [params controllerParams];
+    [invocatin setArgument:&paramsDic atIndex:2];
+    [invocatin invoke];
+    [invocatin getReturnValue: &controller];
   }
   else if ([params.routerOptions.openClass instancesRespondToSelector:CONTROLLER_SELECTOR]) {
-    controller = [[params.routerOptions.openClass alloc] performSelector:CONTROLLER_SELECTOR withObject:[params controllerParams]];
+    __kindof UIViewController *target = [controllerClass alloc];
+    NSMethodSignature *sig  = [controllerClass instanceMethodSignatureForSelector:CONTROLLER_SELECTOR];
+    NSInvocation *invocatin = [NSInvocation invocationWithMethodSignature:sig];
+    [invocatin setTarget:target];
+    [invocatin setSelector:CONTROLLER_SELECTOR];
+    NSDictionary *paramsDic = [params controllerParams];
+    [invocatin setArgument:&paramsDic atIndex:2];
+    [invocatin invoke];
+    controller = target;
   }
-#pragma clang diagnostic pop
+    
   if (!controller) {
     if (_ignoresExceptions) {
       return controller;