Tried to fix the URI_MATCHER