fix bug and change default value