Fix after merge #2.5.