second commit on issue#1-editted fixissue1