[FIX][BUG] Fix the bug from the latest commit