fixed entities issue