Fix a bug from 9367f34b94feb1e4b06ca2b1475be9ba4aae5a89