Fix: Not setting uri arguments correctly