Fix bug: prevent unnecessary entities updates