Fixed bug with addressing.