fixed entities not being resetted