Fixed bug with base address not being correct