Fix for URI Handling