Fixed addresses not being stored in order