Fix to ModelController