Fix - Fix for multi layered URI