Fixed my mistakes again