Fixed errors 2