try to fix the bug