fix the problems in the last build