Fixed bug with address arrays