Allow return to with subdomain

It closes #428.