Fixing entity kill not allowing rollback