Fix URI building issue (#2)