continue to fix the bug