added uri check