diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php
index 9031472..2d8d31a 100644
--- a/setup/wizard/installUtil.php
+++ b/setup/wizard/installUtil.php
@@ -768,12 +768,11 @@ class InstallUtil {
 				$sysdir = explode(DS, SYSTEM_DIR);
 				array_pop($sysdir);
 				array_pop($sysdir);
-				array_pop($sysdir);
 				$zendsys = '';
 				foreach ($sysdir as $v) {
 					$zendsys .= $v.DS;
 				}
-				$jvm = $zendsys."jre".DS."bin".DS."client".DS."jvm.dll";
+				$jvm = $zendsys."java".DS."jre".DS."bin".DS."java.exe";
 				if(file_exists($jvm))
 					return $jvm;
 	    	} else {
diff --git a/setup/wizard/lib/services/windowsLucene.php b/setup/wizard/lib/services/windowsLucene.php
index 52b517f..2e5b5d8 100644
--- a/setup/wizard/lib/services/windowsLucene.php
+++ b/setup/wizard/lib/services/windowsLucene.php
@@ -348,6 +348,8 @@ class windowsLucene extends windowsService {
 	* @return void
  	*/
 	private function setJavaJVM() {
+		$this->javaJVM = SYSTEM_ROOT . "java\jre\bin\client\jvm.dll";
+		/*
 		if(file_exists($this->getJavaBin().DS."client".DS."jvm.dll")) {
 			$this->javaJVM = $this->getJavaBin().DS."client".DS."jvm.dll";
 		} elseif (file_exists($this->getJavaBin().DS."server".DS."jvm.dll")) {
@@ -362,6 +364,7 @@ class windowsLucene extends windowsService {
 				$this->javaJVM = $javaJVM;
 			}
 		}
+		*/
 	}
 
 	public function useZendJVM() {
@@ -392,6 +395,7 @@ class windowsLucene extends windowsService {
 	* @return string
  	*/
 	public function getJavaJVM() {
+		$this->javaJVM = SYSTEM_ROOT . "java\jre\bin\client\jvm.dll";
 		return SYSTEM_ROOT . "java\jre\bin\client\jvm.dll"; // Hard code
 		//return $this->javaJVM; // TODO: PUT BACK!!!
 	}
@@ -413,7 +417,7 @@ class windowsLucene extends windowsService {
  	*/
 	public function install() {
 		$state = $this->status();
-		if($state == '') {
+//		if($state == '') {
 			$luceneExe = $this->getLuceneExe();
 			$luceneSource = $this->getLuceneSource();
 			$luceneDir = $this->getluceneDir();
@@ -428,7 +432,7 @@ class windowsLucene extends windowsService {
 //				return $response;
 //			}
 			return $state;
-		}
+//		}
 
 		return $state;
 	}