URI tracker Fix