Fix after merge #4.