Fix for model selection