Fix a minor bug of the second previous commit