attempt to fix the bug