minor modification after merge