fix connector handler