Fixxing errors