Fixed the EntityHelper