diff --git a/src/Mustache/Autoloader.php b/src/Mustache/Autoloader.php
index 63c3b52..4e6822a 100644
--- a/src/Mustache/Autoloader.php
+++ b/src/Mustache/Autoloader.php
@@ -22,7 +22,8 @@ class Mustache_Autoloader {
 	 * @param string $baseDir Mustache library base directory (default: dirname(__FILE__).'/..')
 	 */
 	public function __construct($baseDir = null) {
-		$this->baseDir = rtrim($baseDir, '/') ?: dirname(__FILE__).'/..';
+		$baseDir = rtrim($baseDir, '/');
+		$this->baseDir = $baseDir ? $basedir : dirname(__FILE__).'/..';
 	}
 
 	/**