Fixed entities being updated when they shouldn't