fixed duplication of line 33