Anotations for next release
Fixed when change the URI inside a event