fix line 69 and 70