diff --git a/BrokoliWebServer/13.sh b/BrokoliWebServer/13.sh
index c52657a..0f5ca7b 100644
--- a/BrokoliWebServer/13.sh
+++ b/BrokoliWebServer/13.sh
@@ -23,9 +23,10 @@ cat > /etc/apache2/sites-available/vitamin.conf <<EOL
 EOL
 
 cat > /var/www/vitamin.brokoli.f01/.htaccess <<EOL
-RewriteEngine On
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^([^\.]+)\$ \$1.php [NC,L]
+RewriteEngine on
+RewriteRule ^(.+)\.php$ /\$1 [R,L]
+RewriteCond %{REQUEST_FILENAME}.php -f
+RewriteRule ^(.*?)/?\$ /\$1.php [NC,END]
 EOL
 
 a2enmod rewrite
diff --git a/BrokoliWebServer/setup.sh b/BrokoliWebServer/setup.sh
index 23c35ab..af74a93 100644
--- a/BrokoliWebServer/setup.sh
+++ b/BrokoliWebServer/setup.sh
@@ -2,4 +2,4 @@
 
 echo "nameserver 192.168.122.1" > /etc/resolv.conf
 apt-get update
-apt-get install unzip php7.2 php7.2-fpm apache2 apache2-utils nginx -y
\ No newline at end of file
+apt-get install unzip php7.2 php7.2-fpm libapache2-mod-php7.2 apache2 apache2-utils nginx -y
\ No newline at end of file