Fix bug caused by 8ca07a0