Finished fixing nonexistant address issue