all fixed again