diff --git a/http-server/Constrict/Request.php b/http-server/Constrict/Request.php
index 5df70cdd..d53c2876 100644
--- a/http-server/Constrict/Request.php
+++ b/http-server/Constrict/Request.php
@@ -3,10 +3,9 @@
 namespace Server\Constrict;
 
 use Http\Context\Context;
-use Server\Message\Request as RequestMessage;
 use Http\Context\Response;
 use Kiri\Kiri;
-use ReflectionException;
+use Server\Message\Request as RequestMessage;
 use Server\RequestInterface;
 
 
@@ -17,6 +16,15 @@ class Request implements RequestInterface
 {
 
 
+	/**
+	 * @return RequestInterface
+	 */
+	private function __call__(): RequestInterface
+	{
+		return Context::getContext(RequestMessage::class);
+	}
+
+
 	/**
 	 * @param $name
 	 * @param $args
@@ -24,11 +32,7 @@ class Request implements RequestInterface
 	 */
 	public function __call($name, $args)
 	{
-		$request = Context::getContext(RequestMessage::class);
-		if (property_exists($request, $name)) {
-			return $request->{$name};
-		}
-		return $request->{$name}(...$args);
+		return $this->__call__()->{$name}(...$args);
 	}
 
 
@@ -39,7 +43,7 @@ class Request implements RequestInterface
 	public function __get($name): mixed
 	{
 		// TODO: Change the autogenerated stub
-		return Context::getContext(RequestMessage::class)->{$name};
+		return $this->__call__()->{$name};
 	}