[FIX] URI: Make URIs work again.
Merge pull request #1259 from vhpoet/fix/uri

[FIX] URI: Make URIs work again