added URI check