fix the problems in the last commit