Fix a bug with the last commit