Fix a regression bug introduced by 0221665