fixed some break changes