fix old stuff