Case 2796 - Modified calls to entity.