fixed some errors caused by last commit