fixed teh brokens