diff --git a/code/solr/Solr.php b/code/solr/Solr.php
index 42ffff4..33368da 100644
--- a/code/solr/Solr.php
+++ b/code/solr/Solr.php
@@ -154,7 +154,11 @@ class Solr_Configure extends BuildTask {
 			echo "done\n";
 		} else {
 			echo "Creating configuration...";
-			$service->coreCreate($index, "$remote/$index");
+			$instanceDir = $indexName;
+			if ($remote) {
+				$instanceDir = "$remote/$instanceDir";
+			}
+			$service->coreCreate($indexName, $instanceDir);
 			echo "done\n";
 		}
 	}
@@ -250,4 +254,4 @@ class Solr_Reindex extends BuildTask {
 		foreach ($items as $item) { $index->add($item); $item->destroy(); }
 	}
 
-}
\ No newline at end of file
+}