yay all fixed