diff --git a/.classpath b/.classpath
deleted file mode 100644
index 5d4c83a..0000000
--- a/.classpath
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="de/neemann/digital/plugin/MyComponentsTest.java" kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Digital"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="module" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/Sim6502Java"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/pom.xml b/pom.xml
index 62dff5c..2b59341 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,10 +20,6 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
-        <repository>
-            <id>github</id>
-            <url>https://maven.pkg.github.com/innot/*</url>
-        </repository>
     </repositories>
 
     <build>
@@ -114,9 +110,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-			<groupId>de.innot.sim6502</groupId>
+			<groupId>com.github.innot</groupId>
 			<artifactId>Sim6502Java</artifactId>
-			<version>0.9.3</version>
+			<version>0.9.2</version>
 		</dependency>
     </dependencies>
 
diff --git a/src/main/java/de/neemann/digital/plugin/MOS6502.java b/src/main/java/de/neemann/digital/plugin/MOS6502.java
index 8ed75d9..bfb8b0b 100644
--- a/src/main/java/de/neemann/digital/plugin/MOS6502.java
+++ b/src/main/java/de/neemann/digital/plugin/MOS6502.java
@@ -168,8 +168,8 @@ public void writeOutputs() throws NodeException {
     	syncOut.setBool(sim_output.sync);
     	rwOut.setBool(sim_output.rw);
 
-        // Set the data bus to output when R/W is low. Otherwise, set to high-Z.
-    	if (!sim_output.rw) {
+        // Set the data bus to output when R/W is low and PHI2 is high. Otherwise, set to high-Z.
+    	if (!sim_output.rw && last_clock) {
     		dataOut.setValue(sim_output.data);
     	} else {
     		dataOut.setToHighZ();