hopfully fixed our bugs