Fix for IEntity/IDTO verification