diff --git a/tests/issue420.phpt b/tests/issue420.phpt
index e54422e6..8a5e6f10 100644
--- a/tests/issue420.phpt
+++ b/tests/issue420.phpt
@@ -32,7 +32,7 @@ PHP
 
 $app = new Yaf_Application($config);
 $req = new Yaf_Request_Simple();
-$req->setControllerName('Foo_Bar');
+$req->setControllerName('Foo_Bar', false);
 var_dump($req->getControllerName());
 $req->setControllerName('index');
 $req->setActionName('func');
diff --git a/yaf_request.c b/yaf_request.c
index 88603b39..e4869c5f 100644
--- a/yaf_request.c
+++ b/yaf_request.c
@@ -1024,8 +1024,8 @@ PHP_METHOD(yaf_request, setModuleName) {
 		} else {
 			if (request->module) {
 				zend_string_release(request->module);
-				request->module = zend_string_copy(module);
 			}
+			request->module = zend_string_copy(module);
 		}
 	}
 
@@ -1050,8 +1050,8 @@ PHP_METHOD(yaf_request, setControllerName) {
 		} else {
 			if (request->controller) {
 				zend_string_release(request->controller);
-				request->controller = zend_string_copy(controller);
 			}
+			request->controller = zend_string_copy(controller);
 		}
 	}
 
@@ -1076,8 +1076,8 @@ PHP_METHOD(yaf_request, setActionName) {
 		} else {
 			if (request->action) {
 				zend_string_release(request->action);
-				request->action = zend_string_copy(action);
 			}
+			request->action = zend_string_copy(action);
 		}
 	}