Fix after merge #5.