Maybe fix the bug