Try to fix the bug