Fixed on change uri