Fix the bug of 4.8 again.