Better handling of cyclic change notifications