Fixed uri generation