Fixed errors 2 :3