Fixed the bug caused by the previous commit