fix bug introduced by the merge