Correct a bug with previous commit