Fixed errors 5