Fixed bug with how many max addresses