fix line 412 and 413