Fix updating entities