modify the master
fix bug