Fix drawing model selection