Still have the expandURL issue.