Fix the bug in the last commit