Fix the same bug ...