BaseModel Bugfix