Better fix for models.