bug fix on line 66