#92 URI build fix