Fixed uri conflict with 2547