diff --git a/app/bootstrap.php b/app/bootstrap.php
index 98244019..ce5c84f2 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -53,7 +53,7 @@ $c->PUBLIC_URL = $c->BASE_URL . $forkPublicPrefix;
 $c->FORK_REVISION = 33;
 $c->START         = $forkStart;
 $c->DIR_APP       = __DIR__;
-$c->DIR_PUBLIC    = $forkPublic;
+$c->DIR_PUBLIC    = __DIR__ . '/../public';
 $c->DIR_CACHE     = __DIR__ . '/cache';
 $c->DIR_VIEWS     = __DIR__ . '/templates';
 $c->DIR_LANG      = __DIR__ . '/lang';
diff --git a/index.dist.php b/index.dist.php
index be014412..3b971a63 100644
--- a/index.dist.php
+++ b/index.dist.php
@@ -8,8 +8,7 @@
 
 declare(strict_types=1);
 
-$forkStart = empty($_SERVER['REQUEST_TIME_FLOAT']) ? \microtime(true) : $_SERVER['REQUEST_TIME_FLOAT'];
-$forkPublic = __DIR__ . '/public';
+$forkStart        = $_SERVER['REQUEST_TIME_FLOAT'] ?? \microtime(true);
 $forkPublicPrefix = '/public';
 
 require __DIR__ . '/app/bootstrap.php';
diff --git a/public/index.dist.php b/public/index.dist.php
index 89c4c79c..ddcc091e 100644
--- a/public/index.dist.php
+++ b/public/index.dist.php
@@ -8,8 +8,7 @@
 
 declare(strict_types=1);
 
-$forkStart = empty($_SERVER['REQUEST_TIME_FLOAT']) ? \microtime(true) : $_SERVER['REQUEST_TIME_FLOAT'];
-$forkPublic = __DIR__;
+$forkStart        = $_SERVER['REQUEST_TIME_FLOAT'] ?? \microtime(true);
 $forkPublicPrefix = '';
 
 require __DIR__ . '/../app/bootstrap.php';