remove dupplication in line 57