Fixed errors 3