change code in issue2
change code in master 3