fix some errors caused by last commit