Fix bug where adresses were limited to 1000