Fixed errors 7