diff --git a/docs/Debugger_Changelog.txt b/docs/Debugger_Changelog.txt
index ee93d64b..600bc3a2 100644
--- a/docs/Debugger_Changelog.txt
+++ b/docs/Debugger_Changelog.txt
@@ -1,4 +1,5 @@
 /*
+ .8 Fixed: Showing/hiding the address and/or opcodes will show long symbolic targets without overflowing into the register info pane Bug #227
  .7 Fixed: ASC #:# with string containing null byte wouldn't show rest of string
  .6 Added: Print-Screen when in debugger will copy the debugger window as text
  .5 Added: Print warnings about duplicate symbols when symbol tables are loaded
diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp
index 7d63f9f8..cde48207 100644
--- a/source/Debugger/Debug.cpp
+++ b/source/Debugger/Debug.cpp
@@ -47,7 +47,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #define ALLOW_INPUT_LOWERCASE 1
 
 	// See /docs/Debugger_Changelog.txt for full details
-	const int DEBUGGER_VERSION = MAKE_VERSION(2,8,0,7);
+	const int DEBUGGER_VERSION = MAKE_VERSION(2,8,0,8);
 
 
 // Public _________________________________________________________________________________________
diff --git a/source/Debugger/Debugger_Display.cpp b/source/Debugger/Debugger_Display.cpp
index 60c4fa16..6e4c98dd 100644
--- a/source/Debugger/Debugger_Display.cpp
+++ b/source/Debugger/Debugger_Display.cpp
@@ -2115,7 +2115,14 @@ WORD DrawDisassemblyLine ( int iLine, const WORD nBaseAddress )
 		//    SYM COPY.FAC.TO.ARG.ROUNDED = EB63
 		// If opcodes aren't showing then length can be longer!
 		// FormatOpcodeBytes() uses 3 chars/MAX_OPCODES. i.e. "## "
-		int nMaxLen = g_bConfigDisasmOpcodesView ? MAX_TARGET_LEN : MAX_TARGET_LEN + (MAX_OPCODES*3);
+		int nMaxLen = MAX_TARGET_LEN;
+
+		// 2.8.0.8: Bug #227: AppleSoft symbol: COPY.FAC.TO.ARG.ROUNDED overflows into registers
+		if ( !g_bConfigDisasmAddressView )
+		    nMaxLen += 4;
+		if ( !g_bConfigDisasmOpcodesView )
+		    nMaxLen += (MAX_OPCODES*3);
+
 		if( nLen >=  nMaxLen )
 		{
 #if _DEBUG