Fixed errors2