fix old macro