changed || to && on line 126