added proper uri check