Fixed the bug in Model.py for real this time.