Fixed shortstuffsushi/SuperModel#3