Fix after merge #3.