revise uri, fix issue #2