Refactored T1\URI-1186.