fix our bugs