Fixed Issue at lines 170 / 171