Added additional check and a commit for uri_for