Fixed errors caused by last commit