It's already fixed by Wuyi's PR, but his PR may take some time to
merge, but I want to get this change in ASAP.