fix bug on master