Fixed errors with last commit