- fixed some bugs in the BaseModel