diff --git a/.gitignore b/.gitignore
index a95e7b10..aa20da34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 composer.lock
 vendor/
 .vscode/
+psysh
diff --git a/composer.json b/composer.json
index ca99db8e..13e4989c 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,8 @@
     "require-dev": {
         "orchestra/testbench": "~3.0",
         "laravel/framework": "5.7.*",
-        "vlucas/phpdotenv": "^2.2"
+        "vlucas/phpdotenv": "^2.2",
+        "psy/psysh": "@stable"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/TenantManager.php b/src/TenantManager.php
index cded69ab..739faac1 100644
--- a/src/TenantManager.php
+++ b/src/TenantManager.php
@@ -189,7 +189,9 @@ class TenantManager
 
     public function actAsId(string $uuid): array
     {
-        return $this->setTenant($this->storage->getTenantById($uuid));
+        $this->setTenant($this->storage->getTenantById($uuid));
+        $this->bootstrap(); // todo this could break storage_path() for example?
+        return $this->tenant;
     }
 
     public function actAsDomain(string $domain): string