fix bug
change setup