More bug correction in ModelManager