Fix the uri support