added fixed for async entity handling