Fix the bug and update