Stop using direct addressing