Fix last problem with model_and_analyze