Fixed check on Entity
Merge pull request #85 from msrba/2.5.x_fix_entity_check

Fixed check on Entity (2.5.x)