Fix to contest model selection