bug fix line 22