same bug fix