fix bug in master