fix old code remainder