fix logic for resolve separator