diff --git a/HttpServer/Route/CoreMiddleware.php b/HttpServer/Route/CoreMiddleware.php
index 6e304fb8..8babfca9 100644
--- a/HttpServer/Route/CoreMiddleware.php
+++ b/HttpServer/Route/CoreMiddleware.php
@@ -26,14 +26,14 @@ class CoreMiddleware implements \HttpServer\IInterface\Middleware
 	 */
 	public function handler(Request $request, Closure $next)
 	{
-		$header = $request->headers;
+
+		$headers = $request->headers;
 
 		/** @var Response $response */
 		$response = Context::getContext('response');
-		$request_method = $header->getHeader('access-control-request-method');
-		$request_headers = $header->getHeader('access-control-request-headers');
-		$response->addHeader('Access-Control-Allow-Headers', $request_headers);
-		$response->addHeader('Access-Control-Request-Method', $request_method);
+		$response->addHeader('Access-Control-Allow-Origin', '*');
+		$response->addHeader('Access-Control-Allow-Headers', $headers->get('access-control-request-headers'));
+		$response->addHeader('Access-Control-Request-Method', $headers->get('access-control-request-method'));
 
 		return $next($request);
 	}