Fix too many updates eventual problem