Fixed custom entities.