diff --git a/build.xml b/build.xml
index a782fc589..fc3fdb825 100644
--- a/build.xml
+++ b/build.xml
@@ -16,8 +16,8 @@
 		<javac srcdir="${src}" destdir="${build}" debug="on" debuglevel="lines,vars,source" includeantruntime="false" encoding="Cp1252">
 			<classpath>
 				<pathelement path="${lib}" />
-				<pathelement location="${lib}/bukkit-1.2.2-R0.1-SNAPSHOT.jar" />
-				<pathelement location="${lib}/craftbukkit-1.2.2-R0.1-SNAPSHOT.jar" />
+				<pathelement location="${lib}/bukkit-1.2.3-R0.2-SNAPSHOT.jar" />
+				<pathelement location="${lib}/craftbukkit-1.2.3-R0.2-SNAPSHOT.jar" />
 				<pathelement location="${lib}/CitizensAPI.jar" />
 			</classpath>
 		</javac>
diff --git a/lib/bukkit-1.2.2-R0.1-SNAPSHOT.jar b/lib/bukkit-1.2.3-R0.2-SNAPSHOT.jar
similarity index 87%
rename from lib/bukkit-1.2.2-R0.1-SNAPSHOT.jar
rename to lib/bukkit-1.2.3-R0.2-SNAPSHOT.jar
index 9b842dc14..c810f7dd9 100644
Binary files a/lib/bukkit-1.2.2-R0.1-SNAPSHOT.jar and b/lib/bukkit-1.2.3-R0.2-SNAPSHOT.jar differ
diff --git a/lib/craftbukkit-1.2.2-R0.1-SNAPSHOT.jar b/lib/craftbukkit-1.2.3-R0.2-SNAPSHOT.jar
similarity index 91%
rename from lib/craftbukkit-1.2.2-R0.1-SNAPSHOT.jar
rename to lib/craftbukkit-1.2.3-R0.2-SNAPSHOT.jar
index 2abd36fe3..bee4712df 100644
Binary files a/lib/craftbukkit-1.2.2-R0.1-SNAPSHOT.jar and b/lib/craftbukkit-1.2.3-R0.2-SNAPSHOT.jar differ
diff --git a/pom.xml b/pom.xml
index 17854fa8d..f797627da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bukkit.version>1.2.3-R0.1-SNAPSHOT</bukkit.version>
-        <craftbukkit.version>1.2.3-R0.1-SNAPSHOT</craftbukkit.version>
+        <bukkit.version>1.2.3-R0.2-SNAPSHOT</bukkit.version>
+        <craftbukkit.version>1.2.3-R0.2-SNAPSHOT</craftbukkit.version>
         <citizensapi.version>2.0-SNAPSHOT</citizensapi.version>
         <build.number>Unknown</build.number>
     </properties>
diff --git a/src/main/java/net/citizensnpcs/trait/text/Text.java b/src/main/java/net/citizensnpcs/trait/text/Text.java
index 01a0a58e6..3cb8a2bab 100644
--- a/src/main/java/net/citizensnpcs/trait/text/Text.java
+++ b/src/main/java/net/citizensnpcs/trait/text/Text.java
@@ -8,6 +8,9 @@ import java.util.Map;
 import java.util.Random;
 
 import org.bukkit.Bukkit;
+import org.bukkit.conversations.Conversation;
+import org.bukkit.conversations.ConversationAbandonedEvent;
+import org.bukkit.conversations.ConversationAbandonedListener;
 import org.bukkit.conversations.ConversationFactory;
 import org.bukkit.entity.Player;
 
@@ -27,7 +30,7 @@ import net.citizensnpcs.util.Paginator;
 import net.minecraft.server.EntityHuman;
 import net.minecraft.server.EntityLiving;
 
-public class Text extends Trait implements Runnable, Toggleable {
+public class Text extends Trait implements Runnable, Toggleable, ConversationAbandonedListener {
     private final Citizens plugin;
     private final NPC npc;
     private final List<String> text = new ArrayList<String>();
@@ -91,13 +94,8 @@ public class Text extends Trait implements Runnable, Toggleable {
     }
 
     @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("Text{talk-close=" + talkClose + ",text=");
-        for (String line : text)
-            builder.append(line + ",");
-        builder.append("}");
-        return builder.toString();
+    public void conversationAbandoned(ConversationAbandonedEvent event) {
+        plugin.getServer().dispatchCommand((Player) event.getContext().getForWhom(), "npc text");
     }
 
     public boolean shouldTalkClose() {
@@ -105,15 +103,16 @@ public class Text extends Trait implements Runnable, Toggleable {
     }
 
     public Editor getEditor(final Player player) {
-        final StartPrompt startPrompt = new StartPrompt(this);
+        final Conversation conversation = new ConversationFactory(plugin).addConversationAbandonedListener(this)
+                .withLocalEcho(false).withEscapeSequence("/npc text").withModality(false).withFirstPrompt(
+                        new StartPrompt(this)).buildConversation(player);
         return new Editor() {
 
             @Override
             public void begin() {
                 Messaging.send(player, "<b>Entered the text editor!");
 
-                new ConversationFactory(plugin).withModality(false).withFirstPrompt(startPrompt).withEscapeSequence(
-                        "/npc text").buildConversation(player).begin();
+                conversation.begin();
             }
 
             @Override
@@ -170,4 +169,14 @@ public class Text extends Trait implements Runnable, Toggleable {
         randomTalker = !randomTalker;
         return randomTalker;
     }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Text{talk-close=" + talkClose + ",text=");
+        for (String line : text)
+            builder.append(line + ",");
+        builder.append("}");
+        return builder.toString();
+    }
 }
\ No newline at end of file