bug fix line 204