Fix problem during change detection