Continue to fix the bug