fix again and again