Fix after merge #2.