Fix watch function