fixing our mistakes