Fixed errors from last commit
Fixed errors form last commit