Fix broken model selection