Fix for non-matched URIs