use old patch and fix the problem