Fixed errors!!!!