diff --git a/screen-display.c b/screen-display.c
index 4124a61e..d786c19c 100644
--- a/screen-display.c
+++ b/screen-display.c
@@ -1,4 +1,4 @@
-/* $Id: screen-display.c,v 1.10 2007-12-06 09:46:22 nicm Exp $ */
+/* $Id: screen-display.c,v 1.11 2007-12-06 10:16:36 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -68,7 +68,7 @@ screen_display_fill_area(struct screen *s, u_int px, u_int py,
 		return;
 	if (!screen_in_x(s, px) || !screen_in_y(s, py))
 		return;
-	if (!screen_in_x(s, px + nx - 1) || !screen_in_y(s, py - ny - 1))
+	if (!screen_in_x(s, px + nx - 1) || !screen_in_y(s, py + ny - 1))
 		return;
 	screen_fill_area(
 	    s, screen_x(s, px), screen_y(s, py), nx, ny, data, attr, colr);
diff --git a/screen-write.c b/screen-write.c
index c033a782..eee14c72 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1,4 +1,4 @@
-/* $Id: screen-write.c,v 1.1 2007-12-06 09:46:23 nicm Exp $ */
+/* $Id: screen-write.c,v 1.2 2007-12-06 10:16:36 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -101,6 +101,8 @@ screen_write_put_character(struct screen_write_ctx *ctx, u_char ch)
 
 	if (s->cx == screen_size_x(s)) {
 		s->cx = 0;
+		if (ctx->write != NULL)
+			ctx->write(ctx->data, TTY_CHARACTER, '\r');
 		screen_write_cursor_down_scroll(ctx);
 	} else if (!screen_in_x(s, s->cx) || !screen_in_y(s, s->cy))
 		return;