diff --git a/src/kits/interface/textview_support/TextGapBuffer.cpp b/src/kits/interface/textview_support/TextGapBuffer.cpp
index bbf6cfaa60..90a75d5daa 100644
--- a/src/kits/interface/textview_support/TextGapBuffer.cpp
+++ b/src/kits/interface/textview_support/TextGapBuffer.cpp
@@ -175,7 +175,7 @@ TextGapBuffer::SizeGapTo(long inCount)
 const char *
 TextGapBuffer::GetString(int32 fromOffset, int32 *_numBytes)
 {
-	char *result = (char *)"";
+	const char *result = "";
 	if (_numBytes == NULL)
 		return result;
 
@@ -216,7 +216,7 @@ TextGapBuffer::GetString(int32 fromOffset, int32 *_numBytes)
 		}
 		result = fScratchBuffer;
 
-		char *scratchPtr = result;
+		char *scratchPtr = fScratchBuffer;
 		for (uint32 i = 0; i < numChars; i++) {
 			memcpy(scratchPtr, B_UTF8_BULLET, charLen);
 			scratchPtr += charLen;