Fixing URI bug [0107001]