Fix model selection