Fix after merge #6.