Fixed errors 6