Fix address parsing