diff --git a/src/kits/interface/TextView.cpp b/src/kits/interface/TextView.cpp
index ca35684849..9bfd1bb0a1 100644
--- a/src/kits/interface/TextView.cpp
+++ b/src/kits/interface/TextView.cpp
@@ -3681,7 +3681,10 @@ BTextView::DrawLines(int32 startLine, int32 endLine, int32 startOffset, bool era
 					}
 					
 					const char *string = fText->GetString(offset, numBytes);
-					view->DrawString(string);
+					// TODO: GetString() could return less or more bytes than requested
+					// Improve the backend api so it's more robust and pass back the returned
+					// bytes
+					view->DrawString(string, numBytes);
 					
 					if (foundTab) {
 						float penPos = PenLocation().x - fTextRect.left;