Refactored URI-1107.