Fix a bug caused by last commit