done:bug fixed