bug fix partial