FIX: partially fixed sources detaching, in case of list