fixed the bug on master