fixed bug on master