Fix last last problem with model_and_analyze