Bug fix to address parsing