Fix the previous wrong fix