diff --git a/console_ncurses.cpp b/console_ncurses.cpp
index 531efee..1850c88 100644
--- a/console_ncurses.cpp
+++ b/console_ncurses.cpp
@@ -146,7 +146,7 @@ void console_ncurses::panel_update_thread()
 			int      run_mode      = current_PSW >> 14;
 
 			uint16_t current_PC    = c->getPC();
-			uint32_t full_addr     = b->getMMU()->calculate_physical_address(c, run_mode, current_PC, false, false, i_space);
+			memory_addresses_t rc  = b->getMMU()->calculate_physical_address(run_mode, current_PC);
 
 			uint16_t current_instr = b->read_word(current_PC);
 
@@ -160,7 +160,7 @@ void console_ncurses::panel_update_thread()
 			wattron(w_panel->win, COLOR_PAIR(1 + run_mode));
 
 			for(uint8_t b=0; b<22; b++)
-				mvwprintw(w_panel->win, 0, 1 + 22 - b,      "%c", full_addr     & (1 << b) ? '1' : '0');
+				mvwprintw(w_panel->win, 0, 1 + 22 - b,      "%c", rc.physical_instruction & (1 << b) ? '1' : '0');
 
 			wattron(w_panel->win, COLOR_PAIR(1));