Fix bug caused by d868325