bug fix on base model