Corrects error in evaluation of the watch when a layer change