bug fix - line 420