diff --git a/byobu-launcher b/byobu-launcher
index c94b8bf1..f375b550 100755
--- a/byobu-launcher
+++ b/byobu-launcher
@@ -18,6 +18,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make sure that we're not already in a screen session
 [ -z "$STY" ] || exit 0
 case "$TERM" in
 	*screen*) exit 0 ;;
diff --git a/debian/changelog b/debian/changelog
index 87464485..ee79b9b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 byobu (2.30) unreleased; urgency=low
 
   * byobu-launcher: make sure that we're not already in a screen session
-    before launching or re-attaching byobu
+    before launching or re-attaching byobu; it seems that $STY is not
+    quite enough, must also check $TERM
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 28 Aug 2009 10:48:38 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 28 Aug 2009 10:53:03 -0500
 
 byobu (2.29-0ubuntu1) karmic; urgency=low