solved issue2 from github