diff --git a/TODO b/TODO
index 3ba1d46c..037abd7d 100644
--- a/TODO
+++ b/TODO
@@ -101,3 +101,7 @@
 - handle resize better in copy mode
 - way to copy stuff that is off screen due to resize
 - fix line wrapping c&p problems in xterm etc
+- it would be awesome if choose-window/choose-session (+choose-client) were
+  extended to accept a command: so you could do "choose-window 'killw -t%%'"
+  and it will replace the selected window target (fully qualified w/ session
+  name etc) in the command and execute it
diff --git a/tty-term.c b/tty-term.c
index 2d7bcae9..795698c0 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -1,4 +1,4 @@
-/* $Id: tty-term.c,v 1.29 2009-08-21 21:15:00 tcunha Exp $ */
+/* $Id: tty-term.c,v 1.30 2009-08-23 11:50:39 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -172,7 +172,7 @@ tty_term_override(struct tty_term *term, const char *overrides)
  			if ((ptr = strchr(entstr, '=')) != NULL) {
 				*ptr++ = '\0';
 				val = xstrdup(ptr);
-				if (strunvis(val, ptr) == NULL) {
+				if (strunvis(val, ptr) == -1) {
 					xfree(val);
 					val = xstrdup(ptr);
 				}