fixed the bug caused by 8c2e23de