Correct address parsing