Fix #4
Update URI Check