Fix the bug