Fixed evaluating in EntityProvider