Fixted errors