Fix after merge #1.