Fixed && Issue