Looks great, thanks - hopefully we already have a set of test cases for address parsing at the bottom of the file? If so, can you add another one for this case? (And for any other cases that look uncovered, if you think of more!) Havoc