Correct a bug because of different commits